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

Fixes ownership checks for creature recruitment

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-05 23:12:57 +03:00
parent f79492e5b0
commit b159d8a028
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
server/CGameHandler.cpp
View File

@@ -2370,28 +2370,40 @@ bool CGameHandler::razeStructure (ObjectInstanceID tid, BuildingID bid)
return true; return true;
} }
bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dstid, CreatureID crid, ui32 cram, si32 fromLvl) bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dstid, CreatureID crid, ui32 cram, si32 fromLvl, PlayerColor player)
{ {
const CGDwelling * dw = static_cast<const CGDwelling *>(getObj(objid)); const CGDwelling * dwelling = dynamic_cast<const CGDwelling *>(getObj(objid));
const CArmedInstance *dst = nullptr; const CGTownInstance * town = dynamic_cast<const CGTownInstance *>(getObj(objid));
const CCreature *c = VLC->creh->objects.at(crid); const CArmedInstance * army = dynamic_cast<const CArmedInstance *>(getObj(dstid));
const CGHeroInstance * hero = dynamic_cast<const CGHeroInstance *>(getObj(dstid));
const CCreature * c = VLC->creh->objects.at(crid);
const bool warMachine = c->warMachine != ArtifactID::NONE; const bool warMachine = c->warMachine != ArtifactID::NONE;
//TODO: test for owning //TODO: check if hero is actually visiting object
//TODO: check if dst can recruit objects (e.g. hero is actually visiting object, town and source are same, etc)
dst = dynamic_cast<const CArmedInstance*>(getObj(dstid));
assert(dw && dst); COMPLAIN_RET_FALSE_IF(!dwelling || !army, "Cannot recruit: invalid object!");
COMPLAIN_RET_FALSE_IF(dwelling->getOwner() != player && dwelling->getOwner() != PlayerColor::UNFLAGGABLE, "Cannot recruit: dwelling not owned!");
if (town)
{
COMPLAIN_RET_FALSE_IF(town != army && !hero, "Cannot recruit: invalid destination!");
COMPLAIN_RET_FALSE_IF(hero != town->garrisonHero && hero != town->visitingHero, "Cannot recruit: can only recruit to town or hero in town!!");
}
else
{
COMPLAIN_RET_FALSE_IF(!hero || hero->getOwner() != player, "Cannot recruit: can only recruit to owned hero!");
}
//verify //verify
bool found = false; bool found = false;
int level = 0; int level = 0;
for (; level < dw->creatures.size(); level++) //iterate through all levels for (; level < dwelling->creatures.size(); level++) //iterate through all levels
{ {
if ((fromLvl != -1) && (level !=fromLvl)) if ((fromLvl != -1) && (level !=fromLvl))
continue; continue;
const auto &cur = dw->creatures.at(level); //current level info <amount, list of cr. ids> const auto &cur = dwelling->creatures.at(level); //current level info <amount, list of cr. ids>
int i = 0; int i = 0;
for (; i < cur.second.size(); i++) //look for crid among available creatures list on current level for (; i < cur.second.size(); i++) //look for crid among available creatures list on current level
if (cur.second.at(i) == crid) if (cur.second.at(i) == crid)
@@ -2404,10 +2416,10 @@ bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst
break; break;
} }
} }
SlotID slot = dst->getSlotFor(crid); SlotID slot = army->getSlotFor(crid);
if ((!found && complain("Cannot recruit: no such creatures!")) if ((!found && complain("Cannot recruit: no such creatures!"))
|| ((si32)cram > VLC->creh->objects.at(crid)->maxAmount(getPlayerState(dst->tempOwner)->resources) && complain("Cannot recruit: lack of resources!")) || ((si32)cram > VLC->creh->objects.at(crid)->maxAmount(getPlayerState(army->tempOwner)->resources) && complain("Cannot recruit: lack of resources!"))
|| (cram<=0 && complain("Cannot recruit: cram <= 0!")) || (cram<=0 && complain("Cannot recruit: cram <= 0!"))
|| (!slot.validSlot() && !warMachine && complain("Cannot recruit: no available slot!"))) || (!slot.validSlot() && !warMachine && complain("Cannot recruit: no available slot!")))
{ {
@@ -2415,33 +2427,28 @@ bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst
} }
//recruit //recruit
giveResources(dst->tempOwner, -(c->getFullRecruitCost() * cram)); giveResources(army->tempOwner, -(c->getFullRecruitCost() * cram));
SetAvailableCreatures sac; SetAvailableCreatures sac;
sac.tid = objid; sac.tid = objid;
sac.creatures = dw->creatures; sac.creatures = dwelling->creatures;
sac.creatures[level].first -= cram; sac.creatures[level].first -= cram;
sendAndApply(&sac); sendAndApply(&sac);
if (warMachine) if (warMachine)
{ {
const CGHeroInstance *h = dynamic_cast<const CGHeroInstance*>(dst);
COMPLAIN_RET_FALSE_IF(!h, "Only hero can buy war machines");
ArtifactID artId = c->warMachine; ArtifactID artId = c->warMachine;
COMPLAIN_RET_FALSE_IF(artId == ArtifactID::CATAPULT, "Catapult cannot be recruited!");
const CArtifact * art = artId.toArtifact(); const CArtifact * art = artId.toArtifact();
COMPLAIN_RET_FALSE_IF(!hero, "Only hero can buy war machines");
COMPLAIN_RET_FALSE_IF(artId == ArtifactID::CATAPULT, "Catapult cannot be recruited!");
COMPLAIN_RET_FALSE_IF(nullptr == art, "Invalid war machine artifact"); COMPLAIN_RET_FALSE_IF(nullptr == art, "Invalid war machine artifact");
return giveHeroNewArtifact(h, art); return giveHeroNewArtifact(hero, art);
} }
else else
{ {
addToSlot(StackLocation(dst, slot), c, cram); addToSlot(StackLocation(army, slot), c, cram);
} }
return true; return true;
} }

2
server/CGameHandler.h
View File

@@ -197,7 +197,7 @@ public:
bool garrisonSwap(ObjectInstanceID tid); bool garrisonSwap(ObjectInstanceID tid);
bool swapGarrisonOnSiege(ObjectInstanceID tid) override; bool swapGarrisonOnSiege(ObjectInstanceID tid) override;
bool upgradeCreature( ObjectInstanceID objid, SlotID pos, CreatureID upgID ); bool upgradeCreature( ObjectInstanceID objid, SlotID pos, CreatureID upgID );
bool recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst, CreatureID crid, ui32 cram, si32 level); bool recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst, CreatureID crid, ui32 cram, si32 level, PlayerColor player);
bool buildStructure(ObjectInstanceID tid, BuildingID bid, bool force=false);//force - for events: no cost, no checkings bool buildStructure(ObjectInstanceID tid, BuildingID bid, bool force=false);//force - for events: no cost, no checkings
bool razeStructure(ObjectInstanceID tid, BuildingID bid); bool razeStructure(ObjectInstanceID tid, BuildingID bid);
bool disbandCreature( ObjectInstanceID id, SlotID pos ); bool disbandCreature( ObjectInstanceID id, SlotID pos );

5
server/NetPacksServer.cpp
View File

@@ -104,8 +104,9 @@ void ApplyGhNetPackVisitor::visitBuildStructure(BuildStructure & pack)
void ApplyGhNetPackVisitor::visitRecruitCreatures(RecruitCreatures & pack) void ApplyGhNetPackVisitor::visitRecruitCreatures(RecruitCreatures & pack)
{ {
gh.throwIfWrongOwner(&pack, pack.tid); gh.throwIfWrongPlayer(&pack);
result = gh.recruitCreatures(pack.tid, pack.dst, pack.crid, pack.amount, pack.level); // ownership checks are inside recruitCreatures
result = gh.recruitCreatures(pack.tid, pack.dst, pack.crid, pack.amount, pack.level, pack.player);
} }
void ApplyGhNetPackVisitor::visitUpgradeCreature(UpgradeCreature & pack) void ApplyGhNetPackVisitor::visitUpgradeCreature(UpgradeCreature & pack)