From ffaaa7da15b42b059258ee9cd9c23b714cfc4ecc Mon Sep 17 00:00:00 2001 From: MichalZr6 Date: Fri, 9 Aug 2024 00:28:28 +0200 Subject: [PATCH] blockingDialog functions: the `answer` parameter can be negative --- lib/mapObjects/CBank.cpp | 2 +- lib/mapObjects/CBank.h | 2 +- lib/mapObjects/CGCreature.cpp | 2 +- lib/mapObjects/CGCreature.h | 2 +- lib/mapObjects/CGDwelling.cpp | 2 +- lib/mapObjects/CGDwelling.h | 2 +- lib/mapObjects/CGPandoraBox.cpp | 2 +- lib/mapObjects/CGPandoraBox.h | 2 +- lib/mapObjects/CGTownBuilding.cpp | 2 +- lib/mapObjects/CGTownBuilding.h | 2 +- lib/mapObjects/CGTownInstance.cpp | 2 +- lib/mapObjects/CGTownInstance.h | 2 +- lib/mapObjects/CQuest.cpp | 4 ++-- lib/mapObjects/CQuest.h | 4 ++-- lib/mapObjects/CRewardableObject.cpp | 2 +- lib/mapObjects/CRewardableObject.h | 2 +- lib/mapObjects/IObjectInterface.cpp | 2 +- lib/mapObjects/IObjectInterface.h | 2 +- lib/mapObjects/MiscObjects.cpp | 6 +++--- lib/mapObjects/MiscObjects.h | 6 +++--- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/mapObjects/CBank.cpp b/lib/mapObjects/CBank.cpp index 8ac6fec76..552237825 100644 --- a/lib/mapObjects/CBank.cpp +++ b/lib/mapObjects/CBank.cpp @@ -393,7 +393,7 @@ void CBank::battleFinished(const CGHeroInstance *hero, const BattleResult &resul } } -void CBank::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CBank::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if (answer) { diff --git a/lib/mapObjects/CBank.h b/lib/mapObjects/CBank.h index d2fe226f1..b61563421 100644 --- a/lib/mapObjects/CBank.h +++ b/lib/mapObjects/CBank.h @@ -40,7 +40,7 @@ public: bool isCoastVisitable() const override; void onHeroVisit(const CGHeroInstance * h) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; std::vector getPopupComponents(PlayerColor player) const override; diff --git a/lib/mapObjects/CGCreature.cpp b/lib/mapObjects/CGCreature.cpp index 94ad2ad84..efba48004 100644 --- a/lib/mapObjects/CGCreature.cpp +++ b/lib/mapObjects/CGCreature.cpp @@ -523,7 +523,7 @@ void CGCreature::battleFinished(const CGHeroInstance *hero, const BattleResult & } } -void CGCreature::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGCreature::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { auto action = takenAction(hero); if(!refusedJoining && action >= JOIN_FOR_FREE) //higher means price diff --git a/lib/mapObjects/CGCreature.h b/lib/mapObjects/CGCreature.h index 588e26d0f..2b88d367d 100644 --- a/lib/mapObjects/CGCreature.h +++ b/lib/mapObjects/CGCreature.h @@ -48,7 +48,7 @@ public: void pickRandomObject(vstd::RNG & rand) override; void newTurn(vstd::RNG & rand) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; CreatureID getCreature() const; //stack formation depends on position, diff --git a/lib/mapObjects/CGDwelling.cpp b/lib/mapObjects/CGDwelling.cpp index a85d412c0..37a717960 100644 --- a/lib/mapObjects/CGDwelling.cpp +++ b/lib/mapObjects/CGDwelling.cpp @@ -516,7 +516,7 @@ void CGDwelling::battleFinished(const CGHeroInstance *hero, const BattleResult & } } -void CGDwelling::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGDwelling::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { auto relations = cb->getPlayerRelations(getOwner(), hero->getOwner()); if(stacksCount() > 0 && relations == PlayerRelations::ENEMIES) //guards present diff --git a/lib/mapObjects/CGDwelling.h b/lib/mapObjects/CGDwelling.h index 4afa3907e..feb4b9bc5 100644 --- a/lib/mapObjects/CGDwelling.h +++ b/lib/mapObjects/CGDwelling.h @@ -54,7 +54,7 @@ private: void newTurn(vstd::RNG & rand) const override; void setPropertyDer(ObjProperty what, ObjPropertyID identifier) override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; std::vector getPopupComponents(PlayerColor player) const override; void updateGuards() const; diff --git a/lib/mapObjects/CGPandoraBox.cpp b/lib/mapObjects/CGPandoraBox.cpp index faa49360b..c9ede1335 100644 --- a/lib/mapObjects/CGPandoraBox.cpp +++ b/lib/mapObjects/CGPandoraBox.cpp @@ -186,7 +186,7 @@ void CGPandoraBox::battleFinished(const CGHeroInstance *hero, const BattleResult } } -void CGPandoraBox::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGPandoraBox::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer) { diff --git a/lib/mapObjects/CGPandoraBox.h b/lib/mapObjects/CGPandoraBox.h index a1e5e8394..7277a792d 100644 --- a/lib/mapObjects/CGPandoraBox.h +++ b/lib/mapObjects/CGPandoraBox.h @@ -26,7 +26,7 @@ public: void initObj(vstd::RNG & rand) override; void onHeroVisit(const CGHeroInstance * h) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; template void serialize(Handler &h) { diff --git a/lib/mapObjects/CGTownBuilding.cpp b/lib/mapObjects/CGTownBuilding.cpp index 367641c1f..3d84843ea 100644 --- a/lib/mapObjects/CGTownBuilding.cpp +++ b/lib/mapObjects/CGTownBuilding.cpp @@ -385,7 +385,7 @@ void CTownRewardableBuilding::heroLevelUpDone(const CGHeroInstance *hero) const grantRewardAfterLevelup(cb, configuration.info.at(selectedReward), town, hero); } -void CTownRewardableBuilding::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CTownRewardableBuilding::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer == 0) return; // player refused diff --git a/lib/mapObjects/CGTownBuilding.h b/lib/mapObjects/CGTownBuilding.h index 9ddf4e616..b8617d784 100644 --- a/lib/mapObjects/CGTownBuilding.h +++ b/lib/mapObjects/CGTownBuilding.h @@ -133,7 +133,7 @@ public: void initObj(vstd::RNG & rand) override; /// applies player selection of reward - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; CTownRewardableBuilding(const BuildingID & index, BuildingSubID::EBuildingSubID subId, CGTownInstance * town, vstd::RNG & rand); CTownRewardableBuilding(IGameCallback *cb); diff --git a/lib/mapObjects/CGTownInstance.cpp b/lib/mapObjects/CGTownInstance.cpp index 6f646bf87..6ef9f9eda 100644 --- a/lib/mapObjects/CGTownInstance.cpp +++ b/lib/mapObjects/CGTownInstance.cpp @@ -281,7 +281,7 @@ void CGTownInstance::setOwner(const PlayerColor & player) const cb->setOwner(this, player); } -void CGTownInstance::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGTownInstance::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { for (auto building : bonusingBuildings) building->blockingDialogAnswered(hero, answer); diff --git a/lib/mapObjects/CGTownInstance.h b/lib/mapObjects/CGTownInstance.h index 57b8c7d26..4804a02a9 100644 --- a/lib/mapObjects/CGTownInstance.h +++ b/lib/mapObjects/CGTownInstance.h @@ -223,7 +223,7 @@ public: protected: void setPropertyDer(ObjProperty what, ObjPropertyID identifier) override; void serializeJsonOptions(JsonSerializeFormat & handler) override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; private: FactionID randomizeFaction(vstd::RNG & rand); diff --git a/lib/mapObjects/CQuest.cpp b/lib/mapObjects/CQuest.cpp index 98179cd05..ca06e4d49 100644 --- a/lib/mapObjects/CQuest.cpp +++ b/lib/mapObjects/CQuest.cpp @@ -660,7 +660,7 @@ const CGCreature * CGSeerHut::getCreatureToKill(bool allowNull) const return dynamic_cast(o); } -void CGSeerHut::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGSeerHut::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { CRewardableObject::blockingDialogAnswered(hero, answer); if(answer) @@ -865,7 +865,7 @@ void CGBorderGuard::onHeroVisit(const CGHeroInstance * h) const } } -void CGBorderGuard::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGBorderGuard::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if (answer) cb->removeObject(this, hero->getOwner()); diff --git a/lib/mapObjects/CQuest.h b/lib/mapObjects/CQuest.h index 281a087ba..407c46134 100644 --- a/lib/mapObjects/CQuest.h +++ b/lib/mapObjects/CQuest.h @@ -150,7 +150,7 @@ public: std::vector getPopupComponents(const CGHeroInstance * hero) const override; void newTurn(vstd::RNG & rand) const override; void onHeroVisit(const CGHeroInstance * h) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; void getVisitText (MetaString &text, std::vector &components, bool FirstVisit, const CGHeroInstance * h = nullptr) const override; virtual void init(vstd::RNG & rand); @@ -229,7 +229,7 @@ public: void initObj(vstd::RNG & rand) override; void onHeroVisit(const CGHeroInstance * h) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; void getVisitText (MetaString &text, std::vector &components, bool FirstVisit, const CGHeroInstance * h = nullptr) const override; void getRolloverText (MetaString &text, bool onHover) const; diff --git a/lib/mapObjects/CRewardableObject.cpp b/lib/mapObjects/CRewardableObject.cpp index b9f122dc4..4fedb7f09 100644 --- a/lib/mapObjects/CRewardableObject.cpp +++ b/lib/mapObjects/CRewardableObject.cpp @@ -181,7 +181,7 @@ void CRewardableObject::heroLevelUpDone(const CGHeroInstance *hero) const grantRewardAfterLevelup(cb, configuration.info.at(selectedReward), this, hero); } -void CRewardableObject::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CRewardableObject::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer == 0) { diff --git a/lib/mapObjects/CRewardableObject.h b/lib/mapObjects/CRewardableObject.h index a3fb7c2e2..9e1735a5f 100644 --- a/lib/mapObjects/CRewardableObject.h +++ b/lib/mapObjects/CRewardableObject.h @@ -63,7 +63,7 @@ public: void heroLevelUpDone(const CGHeroInstance *hero) const override; /// applies player selection of reward - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; void initObj(vstd::RNG & rand) override; diff --git a/lib/mapObjects/IObjectInterface.cpp b/lib/mapObjects/IObjectInterface.cpp index b3101155d..11d9e294c 100644 --- a/lib/mapObjects/IObjectInterface.cpp +++ b/lib/mapObjects/IObjectInterface.cpp @@ -68,7 +68,7 @@ void IObjectInterface::preInit() void IObjectInterface::battleFinished(const CGHeroInstance *hero, const BattleResult &result) const {} -void IObjectInterface::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void IObjectInterface::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const {} void IObjectInterface::garrisonDialogClosed(const CGHeroInstance *hero) const diff --git a/lib/mapObjects/IObjectInterface.h b/lib/mapObjects/IObjectInterface.h index 82a798e72..c528dbc37 100644 --- a/lib/mapObjects/IObjectInterface.h +++ b/lib/mapObjects/IObjectInterface.h @@ -61,7 +61,7 @@ public: //Called when queries created DURING HERO VISIT are resolved //First parameter is always hero that visited object and triggered the query virtual void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const; - virtual void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const; + virtual void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const; virtual void garrisonDialogClosed(const CGHeroInstance *hero) const; virtual void heroLevelUpDone(const CGHeroInstance *hero) const; diff --git a/lib/mapObjects/MiscObjects.cpp b/lib/mapObjects/MiscObjects.cpp index 33e96cbd7..95059c339 100644 --- a/lib/mapObjects/MiscObjects.cpp +++ b/lib/mapObjects/MiscObjects.cpp @@ -215,7 +215,7 @@ void CGMine::battleFinished(const CGHeroInstance *hero, const BattleResult &resu } } -void CGMine::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGMine::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer) cb->startBattleI(hero, this); @@ -348,7 +348,7 @@ void CGResource::battleFinished(const CGHeroInstance *hero, const BattleResult & collectRes(hero->getOwner()); } -void CGResource::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGResource::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer) cb->startBattleI(hero, this); @@ -915,7 +915,7 @@ void CGArtifact::battleFinished(const CGHeroInstance *hero, const BattleResult & pick(hero); } -void CGArtifact::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const +void CGArtifact::blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const { if(answer) cb->startBattleI(hero, this); diff --git a/lib/mapObjects/MiscObjects.h b/lib/mapObjects/MiscObjects.h index 4f15210fc..542894a2f 100644 --- a/lib/mapObjects/MiscObjects.h +++ b/lib/mapObjects/MiscObjects.h @@ -91,7 +91,7 @@ public: void onHeroVisit(const CGHeroInstance * h) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; std::string getObjectName() const override; std::string getPopupText(PlayerColor player) const override; @@ -132,7 +132,7 @@ public: void initObj(vstd::RNG & rand) override; void pickRandomObject(vstd::RNG & rand) override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; std::string getHoverText(PlayerColor player) const override; void collectRes(const PlayerColor & player) const; @@ -163,7 +163,7 @@ private: void onHeroVisit(const CGHeroInstance * h) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; - void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; + void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override; void flagMine(const PlayerColor & player) const; void newTurn(vstd::RNG & rand) const override;