Skip to content

perf(weaponstore): Optimize WeaponStore::findWeaponTemplatePrivate with hash map lookup #2042

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 7 commits into from
Jan 2, 2026
Merged

perf(weaponstore): Optimize WeaponStore::findWeaponTemplatePrivate with hash map lookup #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbb1ae7
Added usage of HashMap towards Weapon Templates
IamInnocent3X Jan 1, 2026
b270da8
Adjusted according to Proposed Changes
IamInnocent3X Jan 1, 2026
403706c
Removed RETAIL_COMPATIBLE_CRC
IamInnocent3X Jan 1, 2026
ec354ab
Adjusted According to Proposed Changes (2)
IamInnocent3X Jan 2, 2026
b2bfe77
Removed Redundant Work
IamInnocent3X Jan 2, 2026
61a6e29
Applied changes to Vanilla Generals
IamInnocent3X Jan 2, 2026
3ca9fb9
Fixed Indent
IamInnocent3X 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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Include/GameLogic/Weapon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,11 @@ class WeaponStore : public SubsystemInterface
};

std::vector<WeaponTemplate*> m_weaponTemplateVector;

// TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key
typedef std::hash_map<NameKeyType, WeaponTemplate*, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > WeaponTemplateMap;
WeaponTemplateMap m_weaponTemplateHashMap;

std::list<WeaponDelayedDamageInfo> m_weaponDDI;
};

Expand Down
8 changes: 5 additions & 3 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,7 @@ WeaponStore::~WeaponStore()
deleteInstance(wt);
}
m_weaponTemplateVector.clear();
m_weaponTemplateHashMap.clear();
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1496,9 +1497,9 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( const char* name ) const
WeaponTemplate *WeaponStore::findWeaponTemplatePrivate( NameKeyType key ) const
{
// search weapon list for name
for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
if( m_weaponTemplateVector[ i ]->getNameKey() == key )
return m_weaponTemplateVector[i];
WeaponTemplateMap::const_iterator it = m_weaponTemplateHashMap.find(key);
if(it != m_weaponTemplateHashMap.end())
return it->second;

return NULL;

Expand All @@ -1517,6 +1518,7 @@ WeaponTemplate *WeaponStore::newWeaponTemplate(AsciiString name)
wt->m_name = name;
wt->m_nameKey = TheNameKeyGenerator->nameToKey( name );
m_weaponTemplateVector.push_back(wt);
m_weaponTemplateHashMap[wt->m_nameKey] = wt;

return wt;
}
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,11 @@ class WeaponStore : public SubsystemInterface
};

std::vector<WeaponTemplate*> m_weaponTemplateVector;

// TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key
typedef std::hash_map<NameKeyType, WeaponTemplate*, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > WeaponTemplateMap;
WeaponTemplateMap m_weaponTemplateHashMap;

std::list<WeaponDelayedDamageInfo> m_weaponDDI;
};

Expand Down
8 changes: 5 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,7 @@ WeaponStore::~WeaponStore()
deleteInstance(wt);
}
m_weaponTemplateVector.clear();
m_weaponTemplateHashMap.clear();
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1641,9 +1642,9 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( const char* name ) const
WeaponTemplate *WeaponStore::findWeaponTemplatePrivate( NameKeyType key ) const
{
// search weapon list for name
for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
if( m_weaponTemplateVector[ i ]->getNameKey() == key )
return m_weaponTemplateVector[i];
WeaponTemplateMap::const_iterator it = m_weaponTemplateHashMap.find(key);
if(it != m_weaponTemplateHashMap.end())
return it->second;

return NULL;

Expand All @@ -1662,6 +1663,7 @@ WeaponTemplate *WeaponStore::newWeaponTemplate(AsciiString name)
wt->m_name = name;
wt->m_nameKey = TheNameKeyGenerator->nameToKey( name );
m_weaponTemplateVector.push_back(wt);
m_weaponTemplateHashMap[wt->m_nameKey] = wt;

return wt;
}
Expand Down
Loading