diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 015ee7540..eb967f35e 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -1626,7 +1626,7 @@ void postConsoleInput( RawData data ) { // Schedule this to happen at the next time event. ConsoleValue argv[2]; - argv[0].setString("eval"); + argv[0].setStringTableEntry("eval"); argv[1].setString(reinterpret_cast(data.data)); Sim::postCurrentEvent(Sim::getRootGroup(), new SimConsoleEvent(2, argv, false)); diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index beec7ccc8..82f953eb1 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -352,7 +352,7 @@ public: { cleanupData(); type = ConsoleValueType::cvSTEntry; - s = (char*)std::move(val); + s = (char*)(StringTable->insert(val)); bufferLen = 0; } diff --git a/Engine/source/console/consoleObject.cpp b/Engine/source/console/consoleObject.cpp index eed85cbfa..dfa17bca2 100644 --- a/Engine/source/console/consoleObject.cpp +++ b/Engine/source/console/consoleObject.cpp @@ -367,10 +367,10 @@ void ConsoleObject::addGroup(const char* in_pGroupname, const char* in_pGroupDoc // Create Field. AbstractClassRep::Field f; f.pFieldname = StringTable->insert(pFieldNameBuf); - f.pGroupname = in_pGroupname; + f.pGroupname = StringTable->insert(in_pGroupname); if(in_pGroupDocs) - f.pFieldDocs = in_pGroupDocs; + f.pFieldDocs = StringTable->insert(in_pGroupDocs); f.type = AbstractClassRep::StartGroupFieldType; f.elementCount = 0; @@ -396,7 +396,7 @@ void ConsoleObject::endGroup(const char* in_pGroupname) // Create Field. AbstractClassRep::Field f; f.pFieldname = StringTable->insert(pFieldNameBuf); - f.pGroupname = in_pGroupname; + f.pGroupname = StringTable->insert(in_pGroupname); f.type = AbstractClassRep::EndGroupFieldType; f.groupExpand = false; f.validator = NULL; @@ -418,7 +418,7 @@ void ConsoleObject::addArray( const char *arrayName, S32 count ) // Create Field. AbstractClassRep::Field f; f.pFieldname = StringTable->insert(nameBuff); - f.pGroupname = arrayName; + f.pGroupname = StringTable->insert(arrayName); f.type = AbstractClassRep::StartArrayFieldType; f.elementCount = count; @@ -441,7 +441,7 @@ void ConsoleObject::endArray( const char *arrayName ) // Create Field. AbstractClassRep::Field f; f.pFieldname = StringTable->insert(nameBuff); - f.pGroupname = arrayName; + f.pGroupname = StringTable->insert(arrayName); f.type = AbstractClassRep::EndArrayFieldType; f.groupExpand = false; f.validator = NULL; @@ -517,7 +517,7 @@ void ConsoleObject::addField(const char* in_pFieldname, AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname)); if (in_pFieldDocs) - f.pFieldDocs = in_pFieldDocs; + f.pFieldDocs = StringTable->insert(in_pFieldDocs); f.type = in_fieldType; f.offset = in_fieldOffset; @@ -612,7 +612,7 @@ void ConsoleObject::addProtectedField(const char* in_pFieldname, AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname)); if (in_pFieldDocs) - f.pFieldDocs = in_pFieldDocs; + f.pFieldDocs = StringTable->insert(in_pFieldDocs); f.type = in_fieldType; f.offset = in_fieldOffset; @@ -646,7 +646,7 @@ void ConsoleObject::addProtectedFieldV(const char* in_pFieldname, AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname)); if (in_pFieldDocs) - f.pFieldDocs = in_pFieldDocs; + f.pFieldDocs = StringTable->insert(in_pFieldDocs); f.type = in_fieldType; f.offset = in_fieldOffset; @@ -718,7 +718,7 @@ void ConsoleObject::addFieldV(const char* in_pFieldname, ConsoleBaseType* conType = ConsoleBaseType::getType(in_fieldType); AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname)); if (in_pFieldDocs) - f.pFieldDocs = in_pFieldDocs; + f.pFieldDocs = StringTable->insert(in_pFieldDocs); f.type = in_fieldType; f.offset = in_fieldOffset; f.table = NULL; diff --git a/Engine/source/console/simSet.cpp b/Engine/source/console/simSet.cpp index 40f81aa3b..f429d7648 100644 --- a/Engine/source/console/simSet.cpp +++ b/Engine/source/console/simSet.cpp @@ -240,7 +240,7 @@ void SimSet::callOnChildren( const String &method, S32 argc, ConsoleValue argv[] // Prep the arguments for the console exec... // // Make sure and leave args[1] empty. ConsoleValue args[21] = { }; - args[0].setString(method.c_str()); + args[0].setStringTableEntry(method.c_str()); for (S32 arg = 0; arg < targc; arg++) args[arg + 2].setString(argv[arg].getString()); diff --git a/Engine/source/console/torquescript/compiledEval.cpp b/Engine/source/console/torquescript/compiledEval.cpp index b9ada8750..076bf04c5 100644 --- a/Engine/source/console/torquescript/compiledEval.cpp +++ b/Engine/source/console/torquescript/compiledEval.cpp @@ -1722,7 +1722,7 @@ Con::EvalResult CodeBlock::exec(U32 ip, const char* functionName, Namespace* thi TORQUE_CASE_FALLTHROUGH; case OP_LOADIMMED_STR: - stack[_STK + 1].setString(curStringTable + code[ip++]); + stack[_STK + 1].setStringTableEntry(curStringTable + code[ip++]); _STK ++; break; @@ -1758,7 +1758,7 @@ Con::EvalResult CodeBlock::exec(U32 ip, const char* functionName, Namespace* thi break; case OP_LOADIMMED_IDENT: - stack[_STK + 1].setString(CodeToSTE(code, ip)); + stack[_STK + 1].setStringTableEntry(CodeToSTE(code, ip)); _STK++; ip += 2; break; diff --git a/Engine/source/sim/netObject.cpp b/Engine/source/sim/netObject.cpp index 2ed8f3d79..e2e655749 100644 --- a/Engine/source/sim/netObject.cpp +++ b/Engine/source/sim/netObject.cpp @@ -570,7 +570,7 @@ void NetObject::addNetworkedField(const char* in_pFieldname, f.pFieldname = StringTable->insert(in_pFieldname); if (in_pFieldDocs) - f.pFieldDocs = in_pFieldDocs; + f.pFieldDocs = StringTable->insert(in_pFieldDocs); f.type = in_fieldType; f.offset = in_fieldOffset;