TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2133 from lukaspj/console-function-errors

Browse source 
Fix minor errors in console function definitions
This commit is contained in:
Areloch 2018-01-10 13:52:33 -06:00 • committed by GitHub
commit 1ef75b411c
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/item.cpp
View file

@ -1209,7 +1209,7 @@ DefineEngineMethod( Item, isRotating, bool, (),,
return object->isRotating(); return object->isRotating();
} }
DefineEngineMethod( Item, setCollisionTimeout, bool, (S32 ignoreColObj),(NULL), DefineEngineMethod( Item, setCollisionTimeout, bool, (S32 ignoreColObj),,
"@brief Temporarily disable collisions against a specific ShapeBase object.\n\n" "@brief Temporarily disable collisions against a specific ShapeBase object.\n\n"
"This is useful to prevent a player from immediately picking up an Item they have " "This is useful to prevent a player from immediately picking up an Item they have "

2
Engine/source/T3D/shapeBase.cpp
View file

@ -4405,7 +4405,7 @@ DefineEngineMethod( ShapeBase, getEyeTransform, TransformF, (),,
return mat; return mat;
} }
DefineEngineMethod( ShapeBase, getLookAtPoint, const char*, ( F32 distance, S32 typeMask ), ( 2000, 0xFFFFFFFF ), DefineEngineMethod( ShapeBase, getLookAtPoint, const char*, ( F32 distance, U32 typeMask ), ( 2000, 0xFFFFFFFF ),
"@brief Get the world position this object is looking at.\n\n" "@brief Get the world position this object is looking at.\n\n"
"Casts a ray from the eye and returns information about what the ray hits.\n" "Casts a ray from the eye and returns information about what the ray hits.\n"

2
Engine/source/scene/sceneManager.cpp
View file

@ -740,7 +740,7 @@ DefineConsoleFunction( sceneDumpZoneStates, void, ( bool updateFirst ), ( true )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
DefineConsoleFunction( sceneGetZoneOwner, SceneObject*, ( U32 zoneId ), ( true ), DefineConsoleFunction( sceneGetZoneOwner, SceneObject*, ( U32 zoneId ),,
"Return the SceneObject that contains the given zone.\n\n" "Return the SceneObject that contains the given zone.\n\n"
"@param zoneId ID of zone.\n" "@param zoneId ID of zone.\n"
"@return A SceneObject or NULL if the given @a zoneId is invalid.\n\n" "@return A SceneObject or NULL if the given @a zoneId is invalid.\n\n"

2
Engine/source/scene/sceneObject.cpp
View file

@ -1265,7 +1265,7 @@ DefineEngineMethod( SceneObject, getType, S32, (),,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
DefineEngineMethod( SceneObject, mountObject, bool, DefineEngineMethod( SceneObject, mountObject, bool,
( SceneObject* objB, S32 slot, TransformF txfm ), ( MatrixF::Identity ), ( SceneObject* objB, S32 slot, TransformF txfm ), ( TransformF::Identity ),
"@brief Mount objB to this object at the desired slot with optional transform.\n\n" "@brief Mount objB to this object at the desired slot with optional transform.\n\n"
"@param objB Object to mount onto us\n" "@param objB Object to mount onto us\n"

2
Engine/source/sim/actionMap.cpp
View file

@ -1868,7 +1868,7 @@ static ConsoleDocFragment _ActionMapbind2(
"ActionMap", "ActionMap",
"bool bind( string device, string action, string flag, string deadZone, string scale, string command );"); "bool bind( string device, string action, string flag, string deadZone, string scale, string command );");
ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier spec, mod...], command )" ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier, spec, mod...], command )"
"@hide") "@hide")
{ {
StringStackWrapper args(argc - 2, argv + 2); StringStackWrapper args(argc - 2, argv + 2);