games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #5847 from IvanSavenko/movement_fix

Browse Source 
Fix incorrect movement gain from objects like Rally Flag
This commit is contained in:
Ivan Savenko
2025-06-30 11:59:04 +03:00
committed by GitHub
parent bd88ae18aa 4181514c3f
commit c250ca6e49
7 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/callback/IGameEventCallback.h
View File

@@ -104,7 +104,7 @@ public:
virtual bool moveHero(ObjectInstanceID hid, int3 dst, EMovementMode moveMove, bool transit = false, PlayerColor asker = PlayerColor::NEUTRAL)=0;
virtual void giveHeroBonus(GiveBonus * bonus)=0;
virtual void setMovePoints(SetMovePoints * smp)=0;
virtual void setMovePoints(ObjectInstanceID hid, int val, ChangeValueMode mode)=0;
virtual void setMovePoints(ObjectInstanceID hid, int val)=0;
virtual void setManaPoints(ObjectInstanceID hid, int val)=0;
virtual void giveHero(ObjectInstanceID id, PlayerColor player, ObjectInstanceID boatId = ObjectInstanceID()) = 0;
virtual void changeObjPos(ObjectInstanceID objid, int3 newPos, const PlayerColor & initiator)=0;

7
lib/gameState/GameStatePackVisitor.cpp
View File

@@ -176,13 +176,8 @@ void GameStatePackVisitor::visitSetMana(SetMana & pack)
void GameStatePackVisitor::visitSetMovePoints(SetMovePoints & pack)
{
CGHeroInstance *hero = gs.getHero(pack.hid);
assert(hero);
if(pack.mode == ChangeValueMode::ABSOLUTE)
hero->setMovementPoints(pack.val);
else
hero->setMovementPoints(hero->movementPointsRemaining() + pack.val);
hero->setMovementPoints(pack.val);
}
void GameStatePackVisitor::visitFoWChange(FoWChange & pack)

5
lib/networkPacks/PacksForClient.h
View File

@@ -351,15 +351,13 @@ struct DLL_LINKAGE SetMana : public CPackForClient
struct DLL_LINKAGE SetMovePoints : public CPackForClient
{
SetMovePoints() = default;
SetMovePoints(ObjectInstanceID hid, si32 val, ChangeValueMode mode)
SetMovePoints(ObjectInstanceID hid, si32 val)
: hid(hid)
, val(val)
, mode(mode)
{}
ObjectInstanceID hid;
si32 val = 0;
ChangeValueMode mode = ChangeValueMode::RELATIVE;
void visitTyped(ICPackVisitor & visitor) override;
@@ -367,7 +365,6 @@ struct DLL_LINKAGE SetMovePoints : public CPackForClient
{
h & val;
h & hid;
h & mode;
}
};

3
server/CGameHandler.cpp
View File

@@ -1335,12 +1335,11 @@ void CGameHandler::setMovePoints(SetMovePoints * smp)
sendAndApply(*smp);
}
void CGameHandler::setMovePoints(ObjectInstanceID hid, int val, ChangeValueMode mode)
void CGameHandler::setMovePoints(ObjectInstanceID hid, int val)
{
SetMovePoints smp;
smp.hid = hid;
smp.val = val;
smp.mode = mode;
sendAndApply(smp);
}

2
server/CGameHandler.h
View File

@@ -166,7 +166,7 @@ public:
bool moveHero(ObjectInstanceID hid, int3 dst, EMovementMode movementMode, bool transit = false, PlayerColor asker = PlayerColor::NEUTRAL) override;
void giveHeroBonus(GiveBonus * bonus) override;
void setMovePoints(SetMovePoints * smp) override;
void setMovePoints(ObjectInstanceID hid, int val, ChangeValueMode mode) override;
void setMovePoints(ObjectInstanceID hid, int val) override;
void setManaPoints(ObjectInstanceID hid, int val) override;
void giveHero(ObjectInstanceID id, PlayerColor player, ObjectInstanceID boatId = ObjectInstanceID()) override;
void changeObjPos(ObjectInstanceID objid, int3 newPos, const PlayerColor & initiator) override;

2
server/processors/NewTurnProcessor.cpp
View File

@@ -590,7 +590,7 @@ std::vector<SetMovePoints> NewTurnProcessor::updateHeroesMovementPoints()
int32_t newMovementPoints = h->movementPointsLimitCached(gameHandler->gameState().getMap().getTile(h->visitablePos()).isLand(), ti.get());
if (newMovementPoints != h->movementPointsRemaining())
result.emplace_back(h->id, newMovementPoints, ChangeValueMode::ABSOLUTE);
result.emplace_back(h->id, newMovementPoints);
}
}
return result;

2
test/mock/mock_IGameEventCallback.h
View File

@@ -74,7 +74,7 @@ public:
bool moveHero(ObjectInstanceID hid, int3 dst, EMovementMode movementMode, bool transit, PlayerColor asker) override {return false;}
void giveHeroBonus(GiveBonus * bonus) override {}
void setMovePoints(SetMovePoints * smp) override {}
void setMovePoints(ObjectInstanceID hid, int val, ChangeValueMode mode) override {};
void setMovePoints(ObjectInstanceID hid, int val) override {};
void setManaPoints(ObjectInstanceID hid, int val) override {}
void giveHero(ObjectInstanceID id, PlayerColor player, ObjectInstanceID boatId) override {}
void changeObjPos(ObjectInstanceID objid, int3 newPos, const PlayerColor & initiator) override {}