games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Prefer to pass CGameState as reference instead of pointer

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-19 14:14:12 +03:00
parent ce436bd63e
commit 4d57a8ed36
67 changed files with 465 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/CGDwelling.cpp
View File

@@ -66,18 +66,18 @@ FactionID CGDwelling::randomizeFaction(vstd::RNG & rand)
if (!randomizationInfo->instanceId.empty())
{
auto iter = cb->gameState()->getMap().instanceNames.find(randomizationInfo->instanceId);
auto iter = cb->gameState().getMap().instanceNames.find(randomizationInfo->instanceId);
if(iter == cb->gameState()->getMap().instanceNames.end())
if(iter == cb->gameState().getMap().instanceNames.end())
logGlobal->error("Map object not found: %s", randomizationInfo->instanceId);
linkedTown = dynamic_cast<CGTownInstance *>(iter->second.get());
}
if (randomizationInfo->identifier != 0)
{
for(auto & townID : cb->gameState()->getMap().getAllTowns())
for(auto & townID : cb->gameState().getMap().getAllTowns())
{
auto town = cb->gameState()->getTown(townID);
auto town = cb->gameState().getTown(townID);
if(town && town->identifier == randomizationInfo->identifier)
{
linkedTown = town;
@@ -222,7 +222,7 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
return;
}
PlayerRelations relations = cb->gameState()->getPlayerRelations( h->tempOwner, tempOwner );
PlayerRelations relations = cb->gameState().getPlayerRelations( h->tempOwner, tempOwner );
if ( relations == PlayerRelations::ALLIES )
return;//do not allow recruiting or capturing