Skip to content

bugfix(thingfactory): Reset next ThingTemplate ID after clearing custom map template overrides to avoid CRC mismatch in the next multiplayer game session #2034

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
xezon merged 8 commits into from
Jan 3, 2026
Merged

bugfix(thingfactory): Reset next ThingTemplate ID after clearing custom map template overrides to avoid CRC mismatch in the next multiplayer game session #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffe9f5e
bugfix(ThingFactory): Reset ThingTemplate ID for each match to avoid …
Caball009 Dec 25, 2025
67f96ad
Simplified thing template count assertion.
Caball009 Dec 25, 2025
0aaa74f
Simplified implementation by relying on the size of the template hash…
Caball009 Dec 29, 2025
703e2d5
Fixed debug assertion.
Caball009 Dec 29, 2025
0d3d9dd
Used template ID value from first template.
Caball009 Dec 31, 2025
d92a62c
Reverted increment logic for 'm_nextTemplateID'.
Caball009 Jan 1, 2026
c4bbe1d
Restored original code.
Caball009 Jan 1, 2026
2756fa2
Replicated in Generals.
Caball009 Jan 2, 2026
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
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,14 @@ void ThingFactory::reset( void )
m_templateHashMap.erase(templateName);
}

DEBUG_ASSERTCRASH(!nextT || t->getTemplateID() == nextT->getTemplateID() + 1, ("Next template ID is unexpected"));

t = nextT;
}

// TheSuperHackers @bugfix Caball009 25/12/2025 Avoid mismatches by making m_nextTemplateID unique for a single match instead of unique since game launch.
DEBUG_ASSERTCRASH(m_firstTemplate && m_firstTemplate->getTemplateID() == m_templateHashMap.size(), ("Template ID is unexpected after deleting overrides"));
m_nextTemplateID = static_cast<UnsignedShort>(m_firstTemplate->getTemplateID() + 1);
}

//-------------------------------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,14 @@ void ThingFactory::reset( void )
m_templateHashMap.erase(templateName);
}

DEBUG_ASSERTCRASH(!nextT || t->getTemplateID() == nextT->getTemplateID() + 1, ("Next template ID is unexpected"));

t = nextT;
}

// TheSuperHackers @bugfix Caball009 25/12/2025 Avoid mismatches by making m_nextTemplateID unique for a single match instead of unique since game launch.
DEBUG_ASSERTCRASH(m_firstTemplate && m_firstTemplate->getTemplateID() == m_templateHashMap.size(), ("Template ID is unexpected after deleting overrides"));
m_nextTemplateID = static_cast<UnsignedShort>(m_firstTemplate->getTemplateID() + 1);
}

//-------------------------------------------------------------------------------------------------
Expand Down
Loading