TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-20 15:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into issue_2115

Browse source
This commit is contained in:
Areloch 2018-02-14 01:43:34 -06:00 • committed by GitHub
commit 6497ea5c76
46 changed files with 805 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Engine/source/console/consoleObject.h
View file

@ -495,7 +495,8 @@ public:
table( NULL ),
validator( NULL ),
setDataFn( NULL ),
getDataFn( NULL )
getDataFn( NULL ),
networkMask(0)
{
doNotSubstitute = keepClearSubsOnly = false;
}
@ -515,9 +516,11 @@ public:
TypeValidator *validator; ///< Validator, if any.
SetDataNotify setDataFn; ///< Set data notify Fn
GetDataNotify getDataFn; ///< Get data notify Fn
WriteDataNotify writeDataFn; ///< Function to determine whether data should be written or not.
WriteDataNotify writeDataFn; ///< Function to determine whether data should be written or not.
bool doNotSubstitute;
bool keepClearSubsOnly;
U32 networkMask;
};
typedef Vector<Field> FieldList;
@ -1263,10 +1266,6 @@ inline bool& ConsoleObject::getDynamicGroupExpand()
EnginePropertyTable _propTable( sizeof( _props ) / sizeof( _props[ 0 ] ) - 1, _props ); \
} }
/// Add an auto-doc for a class.
#define ConsoleDocClass( className, docString ) \
CLASSDOC( className, docString )
/// @}
//------------------------------------------------------------------------------