games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

Remove flaggable bonus on object deletion

Browse Source
This commit is contained in:
Dydzio 2024-12-05 21:55:32 +01:00
parent 7be31c94f2
commit 16d25e903c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/FlaggableMapObject.cpp
View File

@ -51,6 +51,12 @@ void FlaggableMapObject::onHeroVisit( const CGHeroInstance * h ) const
giveBonusTo(h->getOwner()); giveBonusTo(h->getOwner());
} }
void FlaggableMapObject::markAsDeleted() const
{
if(getOwner().isValidPlayer())
takeBonusFrom(getOwner());
}
void FlaggableMapObject::initObj(vstd::RNG & rand) void FlaggableMapObject::initObj(vstd::RNG & rand)
{ {
if(getOwner().isValidPlayer()) if(getOwner().isValidPlayer())

1
lib/mapObjects/FlaggableMapObject.h
View File

@ -28,6 +28,7 @@ public:
using CGObjectInstance::CGObjectInstance; using CGObjectInstance::CGObjectInstance;
void onHeroVisit(const CGHeroInstance * h) const override; void onHeroVisit(const CGHeroInstance * h) const override;
void markAsDeleted() const;
void initObj(vstd::RNG & rand) override; void initObj(vstd::RNG & rand) override;
const IOwnableObject * asOwnable() const final; const IOwnableObject * asOwnable() const final;

14
lib/networkPacks/NetPacksLib.cpp
View File

@ -45,6 +45,7 @@
#include "mapObjectConstructors/CObjectClassesHandler.h" #include "mapObjectConstructors/CObjectClassesHandler.h"
#include "campaign/CampaignState.h" #include "campaign/CampaignState.h"
#include "IGameSettings.h" #include "IGameSettings.h"
#include "mapObjects/FlaggableMapObject.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
@ -1184,7 +1185,6 @@ void RemoveBonus::applyGs(CGameState *gs)
void RemoveObject::applyGs(CGameState *gs) void RemoveObject::applyGs(CGameState *gs)
{ {
CGObjectInstance *obj = gs->getObjInstance(objectID); CGObjectInstance *obj = gs->getObjInstance(objectID);
logGlobal->debug("removing object id=%d; address=%x; name=%s", objectID, (intptr_t)obj, obj->getObjectName()); logGlobal->debug("removing object id=%d; address=%x; name=%s", objectID, (intptr_t)obj, obj->getObjectName());
//unblock tiles //unblock tiles
@ -1197,7 +1197,6 @@ void RemoveObject::applyGs(CGameState *gs)
{ {
auto * beatenHero = dynamic_cast<CGHeroInstance *>(obj); auto * beatenHero = dynamic_cast<CGHeroInstance *>(obj);
assert(beatenHero); assert(beatenHero);
PlayerState * p = gs->getPlayerState(beatenHero->tempOwner);
gs->map->heroesOnMap -= beatenHero; gs->map->heroesOnMap -= beatenHero;
auto * siegeNode = beatenHero->whereShouldBeAttachedOnSiege(gs); auto * siegeNode = beatenHero->whereShouldBeAttachedOnSiege(gs);
@ -1253,7 +1252,16 @@ void RemoveObject::applyGs(CGameState *gs)
} }
if(obj->getOwner().isValidPlayer()) if(obj->getOwner().isValidPlayer())
gs->getPlayerState(obj->getOwner())->removeOwnedObject(obj); //object removed via map event {
gs->getPlayerState(obj->getOwner())->removeOwnedObject(obj); //object removed via map event or hero got beaten
FlaggableMapObject* flaggableObject = dynamic_cast<FlaggableMapObject*>(obj);
if(flaggableObject)
{
flaggableObject->markAsDeleted();
}
}
gs->map->instanceNames.erase(obj->instanceName); gs->map->instanceNames.erase(obj->instanceName);
gs->map->objects[objectID.getNum()].dellNull(); gs->map->objects[objectID.getNum()].dellNull();