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

Merge pull request #2056 from Bloodknight/afx_merge_main

Browse source 
Afx merge main
This commit is contained in:
Areloch 2017-10-11 08:47:47 -05:00 • committed by GitHub
commit 35d649b57e
301 changed files with 59625 additions and 1480 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,10 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
// Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
// Copyright (C) 2015 Faust Logic, Inc.
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
#ifndef _CONSOLEOBJECT_H_
#define _CONSOLEOBJECT_H_
@ -493,6 +497,7 @@ public:
setDataFn( NULL ),
getDataFn( NULL )
{
doNotSubstitute = keepClearSubsOnly = false;
}
StringTableEntry pFieldname; ///< Name of the field.
@ -510,6 +515,8 @@ public:
TypeValidator *validator; ///< Validator, if any.
SetDataNotify setDataFn; ///< Set data notify Fn
GetDataNotify getDataFn; ///< Get data notify Fn
bool doNotSubstitute;
bool keepClearSubsOnly;
WriteDataNotify writeDataFn; ///< Function to determine whether data should be written or not.
};
typedef Vector<Field> FieldList;
@ -1055,6 +1062,9 @@ public:
static ConsoleObject* __findObject( const char* ) { return NULL; }
static const char* __getObjectId( ConsoleObject* ) { return ""; }
protected:
static bool disableFieldSubstitutions(const char* in_pFieldname);
static bool onlyKeepClearSubstitutions(const char* in_pFieldname);
};
#define addNamedField(fieldName,type,className) addField(#fieldName, type, Offset(fieldName,className))