TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 12:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Engine/source/console/console.h
View file

@ -972,38 +972,38 @@ public:
/// @ref console_autodoc
/// @{
StringCallback sc; ///< A function/method that returns a string.
IntCallback ic; ///< A function/method that returns an int.
FloatCallback fc; ///< A function/method that returns a float.
VoidCallback vc; ///< A function/method that returns nothing.
BoolCallback bc; ///< A function/method that returns a bool.
bool group; ///< Indicates that this is a group marker.
bool ns; ///< Indicates that this is a namespace marker.
StringCallback mSC; ///< A function/method that returns a string.
IntCallback mIC; ///< A function/method that returns an int.
FloatCallback mFC; ///< A function/method that returns a float.
VoidCallback mVC; ///< A function/method that returns nothing.
BoolCallback mBC; ///< A function/method that returns a bool.
bool mGroup; ///< Indicates that this is a group marker.
bool mNS; ///< Indicates that this is a namespace marker.
/// @deprecated Unused.
bool callback; ///< Is this a callback into script?
bool mCallback; ///< Is this a callback into script?
/// @}
/// Minimum number of arguments expected by the function.
S32 mina;
S32 mMina;
/// Maximum number of arguments accepted by the funtion. Zero for varargs.
S32 maxa;
S32 mMaxa;
/// Name of the function/method.
const char* funcName;
const char* mFuncName;
/// Name of the class namespace to which to add the method.
const char* className;
const char* mClassName;
/// Usage string for documentation.
const char* usage;
const char* mUsage;
/// Whether this is a TORQUE_TOOLS only function.
bool toolOnly;
bool mToolOnly;
/// The extended function header.
ConsoleFunctionHeader* header;
ConsoleFunctionHeader* mHeader;
/// @name ConsoleConstructor Innards
///
@ -1066,8 +1066,8 @@ public:
/// @{
///
ConsoleConstructor *next;
static ConsoleConstructor *first;
ConsoleConstructor *mNext;
static ConsoleConstructor *mFirst;
void init(const char* cName, const char* fName, const char *usg, S32 minArgs, S32 maxArgs, bool toolOnly = false, ConsoleFunctionHeader* header = NULL);