games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-21 19:19:26 +02:00
Code Issues Releases Activity

Fixes from code review

Browse Source
This commit is contained in:
Dydzio 2024-12-05 21:16:06 +01:00
parent 7a701b39fb
commit 7be31c94f2
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/CGTownInstance.cpp
View File

@ -378,7 +378,10 @@ void CGTownInstance::onHeroLeave(const CGHeroInstance * h) const
std::string CGTownInstance::getObjectName() const
{
return getNameTranslated() + ", " + (ID == Obj::RANDOM_TOWN ? "Random town" : getTown()->faction->getNameTranslated());
if(ID == Obj::RANDOM_TOWN )
return CGObjectInstance::getObjectName();
return getNameTranslated() + ", " + getTown()->faction->getNameTranslated();
}
bool CGTownInstance::townEnvisagesBuilding(BuildingSubID::EBuildingSubID subId) const

6
lib/mapping/CMapDefines.h
View File

@ -45,8 +45,6 @@ public:
std::vector<ObjectInstanceID> deletedObjectsInstances;
std::vector<ObjectInstanceID> unused;
template <typename Handler>
void serialize(Handler & h)
{
@ -73,10 +71,6 @@ public:
{
h & deletedObjectsInstances;
}
else
{
h & unused;
}
}
virtual void serializeJson(JsonSerializeFormat & handler);

6
lib/networkPacks/NetPacksLib.cpp
View File

@ -1199,8 +1199,6 @@ void RemoveObject::applyGs(CGameState *gs)
assert(beatenHero);
PlayerState * p = gs->getPlayerState(beatenHero->tempOwner);
gs->map->heroesOnMap -= beatenHero;
p->removeOwnedObject(beatenHero);
auto * siegeNode = beatenHero->whereShouldBeAttachedOnSiege(gs);
@ -1254,8 +1252,8 @@ void RemoveObject::applyGs(CGameState *gs)
}
}
if(initiator == PlayerColor::NEUTRAL && obj->tempOwner.isValidPlayer())
gs->getPlayerState(obj->tempOwner)->removeOwnedObject(obj); //object removed via map event
if(obj->getOwner().isValidPlayer())
gs->getPlayerState(obj->getOwner())->removeOwnedObject(obj); //object removed via map event
gs->map->instanceNames.erase(obj->instanceName);
gs->map->objects[objectID.getNum()].dellNull();

2
server/processors/NewTurnProcessor.cpp
View File

@ -41,8 +41,6 @@ NewTurnProcessor::NewTurnProcessor(CGameHandler * gameHandler)
void NewTurnProcessor::handleTimeEvents(PlayerColor color)
{
std::vector<const CGObjectInstance*> removedObjects;
for (auto const & event : gameHandler->gameState()->map->events)
{
if (!event.occursToday(gameHandler->gameState()->day))