Skip to content

fix(script): Improve string handling of 'Fundamentalist' code hacks #1797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2025
Merged

fix(script): Improve string handling of 'Fundamentalist' code hacks #1797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0113b63
refactor: Replace manual string prefix logic with safer offset-based …
Skyaero42 Nov 4, 2025
ae7941f
Addressing review comments xezon 2025-11-04
Skyaero42 Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2059,13 +2059,13 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
// quick hack to make loading models with "Fundamentalist" switch to "GLA"
if (pParm->m_string.startsWith("Fundamentalist"))
{
char oldName[256];
const char* replacePrefix = "Fundamentalist";
const size_t offset = pParm->m_string.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, pParm->m_string.str());
strcpy(newName, "GLA");
strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, pParm->m_string.str() + offset, ARRAY_SIZE(newName));
DEBUG_LOG(("Changing Script Ref from %s to %s", pParm->m_string.str(), newName));
pParm->m_string.set(newName);
DEBUG_LOG(("Changing Script Ref from %s to %s", oldName, newName));
}
}

Expand Down
12 changes: 6 additions & 6 deletions Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,11 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)

AsciiString ConvertName(AsciiString name)
{
char oldName[256];
const char* replacePrefix = "Fundamentalist";
const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, name.str());
strcpy(newName, "GLA");
strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
AsciiString swapName;
swapName.set(newName);
const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
Expand All @@ -438,11 +438,11 @@ AsciiString ConvertName(AsciiString name)

AsciiString ConvertFaction(AsciiString name)
{
char oldName[256];
const char* replacePrefix = "FactionFundamentalist";
const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, name.str());
strcpy(newName, "FactionGLA");
strlcat(newName, oldName+strlen("FactionFundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
AsciiString swapName;
swapName.set(newName);
const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(swapName));
Expand Down
8 changes: 4 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2134,13 +2134,13 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
// quick hack to make loading models with "Fundamentalist" switch to "GLA"
if (pParm->m_string.startsWith("Fundamentalist"))
{
char oldName[256];
const char* replacePrefix = "Fundamentalist";
const size_t offset = pParm->m_string.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, pParm->m_string.str());
strcpy(newName, "GLA");
strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, pParm->m_string.str() + offset, ARRAY_SIZE(newName));
DEBUG_LOG(("Changing Script Ref from %s to %s", pParm->m_string.str(), newName));
pParm->m_string.set(newName);
DEBUG_LOG(("Changing Script Ref from %s to %s", oldName, newName));
}
}

Expand Down
18 changes: 9 additions & 9 deletions GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,10 +434,10 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)

AsciiString ConvertToNonGCName(AsciiString name, Bool checkTemplate=true)
{
char oldName[256];
const char* replacePrefix = "GC_";
const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, name.str());
strcpy(newName, oldName+strlen("GC_"));
strlcpy(newName, name.str() + offset, ARRAY_SIZE(newName));
AsciiString swapName;
swapName.set(newName);
if (checkTemplate)
Expand All @@ -453,11 +453,11 @@ AsciiString ConvertToNonGCName(AsciiString name, Bool checkTemplate=true)

AsciiString ConvertName(AsciiString name)
{
char oldName[256];
const char* replacePrefix = "Fundamentalist";
const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, name.str());
strcpy(newName, "GLA");
strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
AsciiString swapName;
swapName.set(newName);
const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
Expand All @@ -469,11 +469,11 @@ AsciiString ConvertName(AsciiString name)

AsciiString ConvertFaction(AsciiString name)
{
char oldName[256];
const char* replacePrefix = "FactionFundamentalist";
const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
char newName[256];
strcpy(oldName, name.str());
strcpy(newName, "FactionGLA");
strlcat(newName, oldName+strlen("FactionFundamentalist"), ARRAY_SIZE(newName));
strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
AsciiString swapName;
swapName.set(newName);
const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(swapName));
Expand Down
Loading