Browse Source

- Moved some TAML constants to a central location.

MelvMay-GG 12 years ago
parent
commit
10f998f

+ 6 - 0
engine/source/persistence/taml/taml.cc

@@ -86,6 +86,12 @@ IMPLEMENT_CONOBJECT( Taml );
 
 //-----------------------------------------------------------------------------
 
+StringTableEntry tamlRefIdName          = StringTable->insert( "TamlId" );
+StringTableEntry tamlRefToIdName        = StringTable->insert( "TamlRefId" );
+StringTableEntry tamlNamedObjectName    = StringTable->insert( "Name" );
+
+//-----------------------------------------------------------------------------
+
 static EnumTable::Enums tamlFormatModeLookup[] =
                 {
                 { Taml::XmlFormat, "xml" },

+ 6 - 0
engine/source/persistence/taml/taml.h

@@ -53,6 +53,12 @@
 
 //-----------------------------------------------------------------------------
 
+extern StringTableEntry tamlRefIdName;
+extern StringTableEntry tamlRefToIdName;
+extern StringTableEntry tamlNamedObjectName;
+
+//-----------------------------------------------------------------------------
+
 #define TAML_SIGNATURE                  "Taml"
 #define TAML_SCHEMA_VARIABLE            "$pref::T2D::TAMLSchema"
 

+ 0 - 6
engine/source/persistence/taml/tamlXmlReader.cc

@@ -27,12 +27,6 @@
 
 //-----------------------------------------------------------------------------
 
-StringTableEntry tamlRefIdName          = StringTable->insert( "TamlId" );
-StringTableEntry tamlRefToIdName        = StringTable->insert( "TamlRefId" );
-StringTableEntry tamlNamedObjectName    = StringTable->insert( "Name" );
-
-//-----------------------------------------------------------------------------
-
 SimObject* TamlXmlReader::read( FileStream& stream )
 {
     // Debug Profiling.

+ 0 - 6
engine/source/persistence/taml/tamlXmlWriter.h

@@ -33,12 +33,6 @@
 
 //-----------------------------------------------------------------------------
 
-extern StringTableEntry tamlRefIdName;
-static StringTableEntry tamlRefToIdName;
-static StringTableEntry tamlNamedObjectName;
-
-//-----------------------------------------------------------------------------
-
 class TamlXmlWriter
 {
 public: