Compilation changes

Few compile time attempts to speed things up

Swap include guards for pramga once
Change compile options in the cmakeLists for source
generate a pch

small tweaks

Engine/source/console/ICallMethod.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ICALLMETHOD_H_
 #define _ICALLMETHOD_H_

Engine/source/console/SimXMLDocument.h

@@ -23,13 +23,12 @@
 //-----------------------------------------------------------------------------
 // Console implementation of STL map.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _XMLDOC_H_
 #define _XMLDOC_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
 
 #ifndef _TVECTOR_H_
 #include "core/util/tVector.h"

Engine/source/console/arrayObject.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ARRAYOBJECT_H_
 #define _ARRAYOBJECT_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
 
 // This class is based on original code by community
 // member Daniel Neilsen:

Engine/source/console/console.h

@@ -19,19 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CONSOLE_H_
 #define _CONSOLE_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _BITSET_H_
+
 #include "core/bitSet.h"
-#endif
-#ifndef _REFBASE_H_
+
 #include "core/util/refBase.h"
-#endif
+
 #include <stdarg.h>
 
 #include "core/util/str.h"

Engine/source/console/consoleFunctions.h

@@ -1,9 +1,8 @@
+#pragma once 
+#pragma once 
 #ifndef _CONSOLFUNCTIONS_H_
 #define _CONSOLFUNCTIONS_H_
-
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
 
 bool isInt(const char* str);
 

Engine/source/console/consoleInternal.h

@@ -19,25 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once
 
-#ifndef _CONSOLEINTERNAL_H_
-#define _CONSOLEINTERNAL_H_
-
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
-#ifndef _STRINGTABLE_H_
+
 #include "core/stringTable.h"
-#endif
-#ifndef _CONSOLETYPES_H
 #include "console/consoleTypes.h"
-#endif
-#ifndef _CONSOLEOBJECT_H_
+
 #include "console/simObject.h"
-#endif
-#ifndef _DATACHUNKER_H_
+
 #include "core/dataChunker.h"
-#endif
+
 #include "module.h"
 
 /// @ingroup console_system Console System
@@ -529,5 +521,3 @@ namespace Con
 }
 
 /// @}
-
-#endif

Engine/source/console/consoleLogger.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _CONSOLE_LOGGER_H_
 #define _CONSOLE_LOGGER_H_

Engine/source/console/consoleObject.cpp

@@ -95,6 +95,33 @@ void AbstractClassRep::init()
    }
 }
 
+void AbstractClassRep::_buildPropertyTable(EnginePropertyTable& smPropTable, EnginePropertyTable& _smPropTable, const EngineTypeInfo* typeInfo)
+{
+   EnginePropertyTable::Property* props = new EnginePropertyTable::Property[sg_tempFieldList.size() + 1];
+
+   for (int i = 0; i < sg_tempFieldList.size(); ++i)
+   {
+      EnginePropertyTable::Property prop;
+      prop.mDocString = sg_tempFieldList[i].pFieldDocs;
+      prop.mName = sg_tempFieldList[i].pFieldname;
+      prop.mNumElements = sg_tempFieldList[i].elementCount;
+      prop.mFlags = 0;
+      if (sg_tempFieldList[i].type == StartGroupFieldType)
+         prop.mFlags |= EnginePropertyGroupBegin;
+      if (sg_tempFieldList[i].type == EndGroupFieldType)
+         prop.mFlags |= EnginePropertyGroupEnd;
+      prop.mType = sg_tempFieldList[i].type;
+
+      props[i] = prop;
+   }
+
+   _smPropTable = EnginePropertyTable(sg_tempFieldList.size(), props);
+   smPropTable = _smPropTable;
+
+   // After we hand it off, immediately delete if safe:
+   delete[] props;
+}
+
 const AbstractClassRep::Field *AbstractClassRep::findField(StringTableEntry name) const
 {
    for(U32 i = 0; i < mFieldList.size(); i++)

Engine/source/console/consoleObject.h

@@ -24,40 +24,20 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once
 #ifndef _CONSOLEOBJECT_H_
 #define _CONSOLEOBJECT_H_
 
-#ifndef _TVECTOR_H_
-   #include "core/util/tVector.h"
-#endif
-#ifndef _STRINGTABLE_H_
-   #include "core/stringTable.h"
-#endif
-#ifndef _STRINGFUNCTIONS_H_
-   #include "core/strings/stringFunctions.h"
-#endif
-#ifndef _BITSET_H_
-   #include "core/bitSet.h"
-#endif
-#ifndef _DYNAMIC_CONSOLETYPES_H_
-   #include "console/dynamicTypes.h"
-#endif
-#ifndef _ENGINEOBJECT_H_
-   #include "console/engineObject.h"
-#endif
-#ifndef _ENGINEFUNCTIONS_H_
-   #include "console/engineFunctions.h"
-#endif
-#ifndef _SIMOBJECTREF_H_
-   #include "console/simObjectRef.h"
-#endif
-#ifndef TINYXML_INCLUDED
-   #include "tinyxml2.h"
-#endif
-
-#ifndef _CONSOLFUNCTIONS_H_
+#include "core/util/tVector.h"
+#include "core/stringTable.h"
+#include "core/strings/stringFunctions.h"
+#include "core/bitSet.h"
+#include "console/dynamicTypes.h"
+#include "console/engineObject.h"
+#include "console/engineFunctions.h"
+#include "console/simObjectRef.h"
+#include "tinyxml2.h"
 #include "console/consoleFunctions.h"
-#endif
 
 /// @file
 /// Legacy console object system.
@@ -416,6 +396,9 @@ protected:
    AbstractClassRep * nextClass;
    AbstractClassRep * parentClass;
    Namespace *        mNamespace;
+   void _buildPropertyTable(EnginePropertyTable& smPropTable,
+                           EnginePropertyTable& _smPropTable,
+                           const EngineTypeInfo* typeInfo);
 
    /// @}
 
@@ -691,31 +674,9 @@ public:
       T::initPersistFields();
       T::consoleInit();
 
-      EnginePropertyTable::Property* props = new EnginePropertyTable::Property[sg_tempFieldList.size() + 1];
-
-      for (int i = 0; i < sg_tempFieldList.size(); ++i)
-      {
-         EnginePropertyTable::Property prop;
-         prop.mDocString = sg_tempFieldList[i].pFieldDocs;
-         prop.mName = sg_tempFieldList[i].pFieldname;
-         prop.mNumElements = sg_tempFieldList[i].elementCount;
-         prop.mFlags = 0;
-         if (sg_tempFieldList[i].type == StartGroupFieldType)
-            prop.mFlags |= EnginePropertyGroupBegin;
-         if (sg_tempFieldList[i].type == EndGroupFieldType)
-            prop.mFlags |= EnginePropertyGroupEnd;
-         prop.mType = sg_tempFieldList[i].type;
-
-         props[i] = prop;
-      }
-
-      _smPropertyTable = EnginePropertyTable(sg_tempFieldList.size(), props);
-      smPropertyTable = _smPropertyTable;
+      _buildPropertyTable(smPropertyTable, _smPropertyTable, mTypeInfo);
 
       const_cast<EngineTypeInfo*>(mTypeInfo)->mPropertyTable = &_smPropertyTable;
-
-      // After we hand it off, immediately delete if safe:
-      delete[] props;
       // Let the base finish up.
       AbstractClassRep::init();
    }

Engine/source/console/consoleParser.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _CONSOLE_PARSER_H_
 #define _CONSOLE_PARSER_H_

Engine/source/console/consoleTypes.h

@@ -19,25 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CONSOLETYPES_H_
 #define _CONSOLETYPES_H_
-
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
 
-#ifndef _MATHTYPES_H_
 #include "math/mathTypes.h"
-#endif
 
-#ifndef _ENGINEPRIMITIVES_H_
 #include "console/enginePrimitives.h"
-#endif
 
-#ifndef _ENGINESTRUCTS_H_
 #include "console/engineStructs.h"
-#endif
 
 template<typename T> inline const T nullAsType(){ return NULL; }
 

Engine/source/console/consoleValueStack.h

@@ -20,6 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _CONSOLE_CONSOLE_VALUE_STACK_H_
 #define _CONSOLE_CONSOLE_VALUE_STACK_H_

Engine/source/console/consoleXMLExport.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CONSOLEXMLEXPORT_H_
 #define _CONSOLEXMLEXPORT_H_
-
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
 
 class SimXMLDocument;
 

Engine/source/console/debugOutputConsumer.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DEBUGOUTPUTCONSUMER_H_
 #define _DEBUGOUTPUTCONSUMER_H_

Engine/source/console/dynamicTypes.h

@@ -19,25 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
-#ifndef _DYNAMIC_CONSOLETYPES_H_
-#define _DYNAMIC_CONSOLETYPES_H_
-
-#ifndef _CONSOLE_H_
 #include "console/console.h"
-#endif
 
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
 
-#ifndef _ENGINETYPEINFO_H_
 #include "console/engineTypeInfo.h"
-#endif
 
-#ifndef _STRINGTABLE_H_
 #include "core/stringTable.h"
-#endif
 
 /// @file
 /// Support for legacy TorqueScript console types.
@@ -454,5 +444,3 @@ const EngineTypeInfo* _MAPTYPE() { return TYPE< T >(); }
    END_IMPLEMENT_BITFIELD
 
 /// @}
-
-#endif

Engine/source/console/engineAPI.h

@@ -19,36 +19,25 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINEAPI_H_
 #define _ENGINEAPI_H_
 
 #include <tuple>
 #include <utility>
-
-#ifndef _FIXEDTUPLE_H_
 #include "fixedTuple.h"
-#endif
 
-#ifndef _CONSOLETYPES_H_
 #include "console/consoleTypes.h"
-#endif
 
-#ifndef _CONSOLE_H_
 #include "console/console.h"
-#endif
 
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
 
-#ifndef _SIMOBJECT_H_
 #include "console/simObject.h"
-#endif
 
-#ifndef _ENGINEFUNCTIONS_H_
 #include "console/engineFunctions.h"
-#endif
 
 // Whatever types are used in API definitions, their DECLAREs must be visible to the
 // macros.  We include the basic primitive and struct types here.
@@ -61,10 +50,7 @@
 #endif
 
 // Needed for the executef macros. Blame GCC.
-#ifndef _SIMEVENTS_H_
 #include "console/simEvents.h"
-#endif
-
 
 /// @file
 /// Definitions for exposing engine functionality to the control layer.

Engine/source/console/engineExports.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINEEXPORTS_H_
 #define _ENGINEEXPORTS_H_

Engine/source/console/engineFunctions.h

@@ -19,15 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once
 
 #ifndef _ENGINEFUNCTIONS_H_
 #define _ENGINEFUNCTIONS_H_
 
 #include <tuple>
-
-#ifndef _FIXEDTUPLE_H_
 #include "fixedTuple.h"
-#endif
 
 #ifndef _ENGINEEXPORTS_H_
    #include "console/engineExports.h"

Engine/source/console/engineObject.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINEOBJECT_H_
 #define _ENGINEOBJECT_H_

Engine/source/console/enginePrimitives.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINEPRIMITIVES_H_
 #define _ENGINEPRIMITIVES_H_

Engine/source/console/engineStructs.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINESTRUCTS_H_
 #define _ENGINESTRUCTS_H_

Engine/source/console/engineTypeInfo.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINETYPEINFO_H_
 #define _ENGINETYPEINFO_H_

Engine/source/console/engineTypes.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENGINETYPES_H_
 #define _ENGINETYPES_H_

Engine/source/console/fieldBrushObject.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FIELDBRUSHOBJECT_H_
 #define _FIELDBRUSHOBJECT_H_

Engine/source/console/fixedTuple.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FIXEDTUPLE_H_
 #define _FIXEDTUPLE_H_

Engine/source/console/module.h

@@ -1,3 +1,4 @@
+#pragma once 
 #ifndef _SCRIPT_MODULE_H_
 #define _SCRIPT_MODULE_H_
 #include "runtime.h"

Engine/source/console/persistenceManager.h

@@ -19,21 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PERSISTENCEMANAGER_H_
 #define _PERSISTENCEMANAGER_H_
-
-#ifndef _SIMOBJECT_H_
 #include "console/simObject.h"
-#endif
 
-#ifndef _SIMOBJECTLIST_H_
 #include "console/simObjectList.h"
-#endif
 
-#ifndef _TOKENIZER_H_
 #include "core/tokenizer.h"
-#endif
 
 class PersistenceManager : public SimObject
 {

Engine/source/console/propertyParsing.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PROPERTYPARSING_H_
 #define _PROPERTYPARSING_H_

Engine/source/console/returnBuffer.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RETURNBUFFER_H_
 #define _RETURNBUFFER_H_

Engine/source/console/runtime.h

@@ -1,3 +1,5 @@
+#pragma once 
+#pragma once 
 #ifndef _RUNTIME_H_
 #define _RUNTIME_H_
 

Engine/source/console/runtimeClassRep.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _RUNTIME_CLASSREP_H_
 #define _RUNTIME_CLASSREP_H_

Engine/source/console/script.h

@@ -1,3 +1,5 @@
+#pragma once 
+#pragma once 
 #ifndef _SCRIPT_H_
 #define _SCRIPT_H_
 

Engine/source/console/scriptFilename.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SCRIPTFILENAME_H_
 #define _SCRIPTFILENAME_H_

Engine/source/console/scriptObjects.h

@@ -19,17 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SCRIPTOBJECTS_H_
 #define _SCRIPTOBJECTS_H_
-
-#ifndef _CONSOLEINTERNAL_H_
 #include "console/consoleInternal.h"
-#endif
 
-#ifndef _ITICKABLE_H_
 #include "core/iTickable.h"
-#endif
 
 //-----------------------------------------------------------------------------
 // ScriptObject

Engine/source/console/sim.h

@@ -19,22 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIM_H_
 #define _SIM_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
-#ifndef _TORQUE_STRING_H_
+
 #include "core/util/str.h"
-#endif
-#ifndef _MODULE_H_
+
 #include "core/module.h"
-#endif
-#ifndef _CONSOLE_H_
+
 #include "console/console.h"
-#endif
 
 // Forward Refs
 class SimSet;

Engine/source/console/simBase.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMBASE_H_
 #define _SIMBASE_H_

Engine/source/console/simDatablock.h

@@ -24,12 +24,11 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 #ifndef _SIMDATABLOCK_H_
 #define _SIMDATABLOCK_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
 
 // Forward Refs
 class BitStream;

Engine/source/console/simDictionary.h

@@ -19,19 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMDICTIONARY_H_
 #define _SIMDICTIONARY_H_
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _STRINGTABLE_H_
-#include "core/stringTable.h"
-#endif
 
-#ifndef _PLATFORMMUTEX_H_
+#include "core/stringTable.h"
+
 #include "platform/threads/mutex.h"
-#endif
 
 #include "torqueConfig.h"
 
@@ -40,10 +37,7 @@ class SimObject;
 #ifdef USE_NEW_SIMDICTIONARY
 #include <string>
 #include <unordered_map>
-
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
 
 struct StringTableEntryHash
 {

Engine/source/console/simEvents.h

@@ -19,17 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMEVENTS_H_
 #define _SIMEVENTS_H_
-
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
-
-#ifndef _UTIL_DELEGATE_H_
 #include "core/util/delegate.h"
-#endif
 
 // Forward Refs
 class SimObject;

Engine/source/console/simFieldDictionary.h

@@ -24,6 +24,8 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _SIMFIELDDICTIONARY_H_
 #define _SIMFIELDDICTIONARY_H_
@@ -34,10 +36,7 @@ class SimObject;
 
 #include "core/stringTable.h"
 #include "core/stream/stream.h"
-
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
 
 /// Dictionary to keep track of dynamic fields on SimObject.
 class SimFieldDictionary

Engine/source/console/simObject.h

@@ -24,6 +24,8 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 #ifndef _SIMOBJECT_H_
 #define _SIMOBJECT_H_
 
@@ -36,14 +38,9 @@
 #ifndef _BITSET_H_
    #include "core/bitSet.h"
 #endif
-
-#ifndef _TAML_CALLBACKS_H_
 #include "persistence/taml/tamlCallbacks.h"
-#endif
 
-#ifndef _OBJECTTYPES_H_
 #include "T3D/objectTypes.h"
-#endif
 
 class Stream;
 class LightManager;

Engine/source/console/simObjectList.h

@@ -19,19 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMOBJECTLIST_H_
 #define _SIMOBJECTLIST_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
-#ifndef _TALGORITHM_H_
+
 #include "core/tAlgorithm.h"
-#endif
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
 
 // Forward Refs
 class SimObject;

Engine/source/console/simObjectMemento.h

@@ -19,14 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _CONSOLE_SIMOBJECTMEMENTO_H_
 #define _CONSOLE_SIMOBJECTMEMENTO_H_
-
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
-
 
 /// This simple class is used to store an SimObject and 
 /// its state so it can be recreated at a later time.

Engine/source/console/simObjectRef.h

@@ -19,20 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMOBJECTREF_H_
 #define _SIMOBJECTREF_H_
-
-
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
 
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
-
-
 
 // SimObjectRef<T>
 

Engine/source/console/simPersistID.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMPERSISTID_H_
 #define _SIMPERSISTID_H_

Engine/source/console/simPersistSet.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMPERSISTSET_H_
 #define _SIMPERSISTSET_H_

Engine/source/console/simSet.h

@@ -19,25 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SIMSET_H_
 #define _SIMSET_H_
-
-#ifndef _SIMOBJECT_H_
 #include "console/simObject.h"
-#endif
 
-#ifndef _SIMOBJECTLIST_H_
 #include "console/simObjectList.h"
-#endif
 
-#ifndef _SIMDICTIONARY_H_
 #include "console/simDictionary.h"
-#endif
 
-#ifndef _TSIGNAL_H_
 #include "core/util/tSignal.h"
-#endif
 
 #include "persistence/taml/tamlChildren.h"
 

Engine/source/console/stringStack.h

@@ -19,21 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STRINGSTACK_H_
 #define _STRINGSTACK_H_
-
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
 
-#ifndef _STRINGTABLE_H_
 #include "core/stringTable.h"
-#endif
 
-#ifndef _CONSOLE_H_
 #include "console/console.h"
-#endif
 
 typedef U32 StringStackPtr;
 struct StringStack;

Engine/source/console/telnetConsole.h

@@ -19,13 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TELNETCONSOLE_H_
 #define _TELNETCONSOLE_H_
-
-#ifndef _CONSOLE_H_
 #include "console/console.h"
-#endif
+
 #include "platform/platformNet.h"
 
 /// Telnet admin console.

Engine/source/console/telnetDebugger.h

@@ -19,13 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TELNETDEBUGGER_H_
 #define _TELNETDEBUGGER_H_
-
-#ifndef _PLATFORM_PLATFORMNET_H_
 #include "platform/platformNet.h"
-#endif
+
 #include "module.h"
 
 /// Telnet debug service implementation.

Engine/source/console/torquescript/ast.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _AST_H_
 #define _AST_H_

Engine/source/console/torquescript/codeBlock.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CODEBLOCK_H_
 #define _CODEBLOCK_H_

Engine/source/console/torquescript/compiler.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 
 #ifndef _COMPILER_H_
@@ -41,10 +43,7 @@ class DataChunker;
 #include "platform/platform.h"
 #include "ast.h"
 #include "codeBlock.h"
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 //------------------------------------------------------------
 

Engine/source/console/torquescript/parser.h

@@ -1,4 +1,5 @@
-#ifndef _TORQUESCRIPT_PARSER_H_
+#pragma once 
+#ifndef _TORQUESCRIPT_PARSER_H_
 #define _TORQUESCRIPT_PARSER_H_
 #include <cstdio>
 

Engine/source/console/torquescript/runtime.h

@@ -1,4 +1,5 @@
-#ifndef _TORQUESCRIPT_RUNTIME_H_
+#pragma once 
+#ifndef _TORQUESCRIPT_RUNTIME_H_
 #define _TORQUESCRIPT_RUNTIME_H_
 #include "ast.h"
 #include "console/runtime.h"

Engine/source/console/typeValidators.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TYPEVALIDATORS_H_
 #define _TYPEVALIDATORS_H_
-
-#ifndef _MMATHFN_H_
 #include "math/mMathFn.h"
-#endif
 
 class TypeValidator
 {