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

variable naming cleanup due to locals overriding in multiple places. objectname to mObjectName+ getName() refs in dictionary.

Browse source
This commit is contained in:
Azaezel 2018-03-12 02:36:52 -05:00
parent e079536122
commit 886dcbaac5
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/console/simObject.h
View file

@ -293,7 +293,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
};
// dictionary information stored on the object
StringTableEntry objectName;
StringTableEntry mObjectName;
StringTableEntry mOriginalName;
SimObject* nextNameObject;
SimObject* nextManagerNameObject;
@ -358,7 +358,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
{ static_cast<SimObject*>(object)->setSuperClassNamespace(data); return false; };
static bool writeObjectName(void* obj, StringTableEntry pFieldName)
{ SimObject* simObject = static_cast<SimObject*>(obj); return simObject->objectName != NULL && simObject->objectName != StringTable->EmptyString(); }
{ SimObject* simObject = static_cast<SimObject*>(obj); return simObject->mObjectName != NULL && simObject->mObjectName != StringTable->EmptyString(); }
static bool writeCanSaveDynamicFields(void* obj, StringTableEntry pFieldName)
{ return static_cast<SimObject*>(obj)->mCanSaveFieldDictionary == false; }
static bool writeInternalName(void* obj, StringTableEntry pFieldName)
@ -761,7 +761,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
const char* getIdString() const { return mIdString; }
/// Return the name of this object.
StringTableEntry getName() const { return objectName; }
StringTableEntry getName() const { return mObjectName; }
/// Return the SimGroup that this object is contained in. Never NULL except for
/// RootGroup and unregistered objects.