TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1471 from Azaezel/alpha41/stringTableSet

Browse source 
more stringtable leveraging
This commit is contained in:
Brian Roberts 2025-05-19 20:24:27 -05:00 • committed by GitHub
commit 8062734ecc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/console.cpp
View file

@ -1626,7 +1626,7 @@ void postConsoleInput( RawData data )
{ {
// Schedule this to happen at the next time event. // Schedule this to happen at the next time event.
ConsoleValue argv[2]; ConsoleValue argv[2];
argv[0].setString("eval"); argv[0].setStringTableEntry("eval");
argv[1].setString(reinterpret_cast<const char*>(data.data)); argv[1].setString(reinterpret_cast<const char*>(data.data));
Sim::postCurrentEvent(Sim::getRootGroup(), new SimConsoleEvent(2, argv, false)); Sim::postCurrentEvent(Sim::getRootGroup(), new SimConsoleEvent(2, argv, false));

2
Engine/source/console/console.h
View file

@ -352,7 +352,7 @@ public:
{ {
cleanupData(); cleanupData();
type = ConsoleValueType::cvSTEntry; type = ConsoleValueType::cvSTEntry;
s = (char*)std::move(val); s = (char*)(StringTable->insert(val));
bufferLen = 0; bufferLen = 0;
} }

18
Engine/source/console/consoleObject.cpp
View file

@ -367,10 +367,10 @@ void ConsoleObject::addGroup(const char* in_pGroupname, const char* in_pGroupDoc
// Create Field. // Create Field.
AbstractClassRep::Field f; AbstractClassRep::Field f;
f.pFieldname = StringTable->insert(pFieldNameBuf); f.pFieldname = StringTable->insert(pFieldNameBuf);
f.pGroupname = in_pGroupname; f.pGroupname = StringTable->insert(in_pGroupname);
if(in_pGroupDocs) if(in_pGroupDocs)
f.pFieldDocs = in_pGroupDocs; f.pFieldDocs = StringTable->insert(in_pGroupDocs);
f.type = AbstractClassRep::StartGroupFieldType; f.type = AbstractClassRep::StartGroupFieldType;
f.elementCount = 0; f.elementCount = 0;
@ -396,7 +396,7 @@ void ConsoleObject::endGroup(const char* in_pGroupname)
// Create Field. // Create Field.
AbstractClassRep::Field f; AbstractClassRep::Field f;
f.pFieldname = StringTable->insert(pFieldNameBuf); f.pFieldname = StringTable->insert(pFieldNameBuf);
f.pGroupname = in_pGroupname; f.pGroupname = StringTable->insert(in_pGroupname);
f.type = AbstractClassRep::EndGroupFieldType; f.type = AbstractClassRep::EndGroupFieldType;
f.groupExpand = false; f.groupExpand = false;
f.validator = NULL; f.validator = NULL;
@ -418,7 +418,7 @@ void ConsoleObject::addArray( const char *arrayName, S32 count )
// Create Field. // Create Field.
AbstractClassRep::Field f; AbstractClassRep::Field f;
f.pFieldname = StringTable->insert(nameBuff); f.pFieldname = StringTable->insert(nameBuff);
f.pGroupname = arrayName; f.pGroupname = StringTable->insert(arrayName);
f.type = AbstractClassRep::StartArrayFieldType; f.type = AbstractClassRep::StartArrayFieldType;
f.elementCount = count; f.elementCount = count;
@ -441,7 +441,7 @@ void ConsoleObject::endArray( const char *arrayName )
// Create Field. // Create Field.
AbstractClassRep::Field f; AbstractClassRep::Field f;
f.pFieldname = StringTable->insert(nameBuff); f.pFieldname = StringTable->insert(nameBuff);
f.pGroupname = arrayName; f.pGroupname = StringTable->insert(arrayName);
f.type = AbstractClassRep::EndArrayFieldType; f.type = AbstractClassRep::EndArrayFieldType;
f.groupExpand = false; f.groupExpand = false;
f.validator = NULL; 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)); AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname));
if (in_pFieldDocs) if (in_pFieldDocs)
f.pFieldDocs = in_pFieldDocs; f.pFieldDocs = StringTable->insert(in_pFieldDocs);
f.type = in_fieldType; f.type = in_fieldType;
f.offset = in_fieldOffset; 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)); AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname));
if (in_pFieldDocs) if (in_pFieldDocs)
f.pFieldDocs = in_pFieldDocs; f.pFieldDocs = StringTable->insert(in_pFieldDocs);
f.type = in_fieldType; f.type = in_fieldType;
f.offset = in_fieldOffset; 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)); AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname));
if (in_pFieldDocs) if (in_pFieldDocs)
f.pFieldDocs = in_pFieldDocs; f.pFieldDocs = StringTable->insert(in_pFieldDocs);
f.type = in_fieldType; f.type = in_fieldType;
f.offset = in_fieldOffset; f.offset = in_fieldOffset;
@ -718,7 +718,7 @@ void ConsoleObject::addFieldV(const char* in_pFieldname,
ConsoleBaseType* conType = ConsoleBaseType::getType(in_fieldType); ConsoleBaseType* conType = ConsoleBaseType::getType(in_fieldType);
AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname)); AssertFatal(conType, avar("ConsoleObject::addProtectedField[%s] - invalid console type", in_pFieldname));
if (in_pFieldDocs) if (in_pFieldDocs)
f.pFieldDocs = in_pFieldDocs; f.pFieldDocs = StringTable->insert(in_pFieldDocs);
f.type = in_fieldType; f.type = in_fieldType;
f.offset = in_fieldOffset; f.offset = in_fieldOffset;
f.table = NULL; f.table = NULL;

2
Engine/source/console/simSet.cpp
View file

@ -240,7 +240,7 @@ void SimSet::callOnChildren( const String &method, S32 argc, ConsoleValue argv[]
// Prep the arguments for the console exec... // Prep the arguments for the console exec...
// // Make sure and leave args[1] empty. // // Make sure and leave args[1] empty.
ConsoleValue args[21] = { }; ConsoleValue args[21] = { };
args[0].setString(method.c_str()); args[0].setStringTableEntry(method.c_str());
for (S32 arg = 0; arg < targc; arg++) for (S32 arg = 0; arg < targc; arg++)
args[arg + 2].setString(argv[arg].getString()); args[arg + 2].setString(argv[arg].getString());

4
Engine/source/console/torquescript/compiledEval.cpp
View file

@ -1722,7 +1722,7 @@ Con::EvalResult CodeBlock::exec(U32 ip, const char* functionName, Namespace* thi
TORQUE_CASE_FALLTHROUGH; TORQUE_CASE_FALLTHROUGH;
case OP_LOADIMMED_STR: case OP_LOADIMMED_STR:
stack[_STK + 1].setString(curStringTable + code[ip++]); stack[_STK + 1].setStringTableEntry(curStringTable + code[ip++]);
_STK ++; _STK ++;
break; break;
@ -1758,7 +1758,7 @@ Con::EvalResult CodeBlock::exec(U32 ip, const char* functionName, Namespace* thi
break; break;
case OP_LOADIMMED_IDENT: case OP_LOADIMMED_IDENT:
stack[_STK + 1].setString(CodeToSTE(code, ip)); stack[_STK + 1].setStringTableEntry(CodeToSTE(code, ip));
_STK++; _STK++;
ip += 2; ip += 2;
break; break;

2
Engine/source/sim/netObject.cpp
View file

@ -570,7 +570,7 @@ void NetObject::addNetworkedField(const char* in_pFieldname,
f.pFieldname = StringTable->insert(in_pFieldname); f.pFieldname = StringTable->insert(in_pFieldname);
if (in_pFieldDocs) if (in_pFieldDocs)
f.pFieldDocs = in_pFieldDocs; f.pFieldDocs = StringTable->insert(in_pFieldDocs);
f.type = in_fieldType; f.type = in_fieldType;
f.offset = in_fieldOffset; f.offset = in_fieldOffset;