games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Fix crash on rearranging troops on non-owned hero

Browse Source
This commit is contained in:
Ivan Savenko
2024-11-17 13:55:33 +00:00
parent 56ee307b3a
commit c82db9d574
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/widgets/CGarrisonInt.cpp
View File

@@ -274,12 +274,12 @@ bool CGarrisonSlot::mustForceReselection() const
if (!LOCPLINT->makingTurn) if (!LOCPLINT->makingTurn)
return true; return true;
if (!creature || !selection->creature)
return false;
// Attempt to take creatures from ally (select theirs first) // Attempt to take creatures from ally (select theirs first)
if (!selection->our()) if (!selection->our())
return true; return true;
if (!creature || !selection->creature)
return false;
// Attempt to swap creatures with ally (select ours first) // Attempt to swap creatures with ally (select ours first)
if (selection->creature != creature && withAlly) if (selection->creature != creature && withAlly)

3
client/windows/CHeroWindow.cpp
View File

@@ -199,10 +199,11 @@ void CHeroWindow::update()
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
if(!garr) if(!garr)
{ {
bool removableTroops = curHero->getOwner() == LOCPLINT->playerID;
std::string helpBox = heroscrn[32]; std::string helpBox = heroscrn[32];
boost::algorithm::replace_first(helpBox, "%s", CGI->generaltexth->allTexts[43]); boost::algorithm::replace_first(helpBox, "%s", CGI->generaltexth->allTexts[43]);
garr = std::make_shared<CGarrisonInt>(Point(15, 485), 8, Point(), curHero); garr = std::make_shared<CGarrisonInt>(Point(15, 485), 8, Point(), curHero, nullptr, removableTroops);
auto split = std::make_shared<CButton>(Point(539, 519), AnimationPath::builtin("hsbtns9.def"), CButton::tooltip(CGI->generaltexth->allTexts[256], helpBox), [this](){ garr->splitClick(); }, EShortcut::HERO_ARMY_SPLIT); auto split = std::make_shared<CButton>(Point(539, 519), AnimationPath::builtin("hsbtns9.def"), CButton::tooltip(CGI->generaltexth->allTexts[256], helpBox), [this](){ garr->splitClick(); }, EShortcut::HERO_ARMY_SPLIT);
garr->addSplitBtn(split); garr->addSplitBtn(split);
} }

4
lib/CGameInfoCallback.cpp
View File

@@ -957,12 +957,12 @@ void CGameInfoCallback::calculatePaths( const CGHeroInstance *hero, CPathsInfo &
const CArtifactInstance * CGameInfoCallback::getArtInstance( ArtifactInstanceID aid ) const const CArtifactInstance * CGameInfoCallback::getArtInstance( ArtifactInstanceID aid ) const
{ {
return gs->map->artInstances[aid.num]; return gs->map->artInstances.at(aid.num);
} }
const CGObjectInstance * CGameInfoCallback::getObjInstance( ObjectInstanceID oid ) const const CGObjectInstance * CGameInfoCallback::getObjInstance( ObjectInstanceID oid ) const
{ {
return gs->map->objects[oid.num]; return gs->map->objects.at(oid.num);
} }
const CArtifactSet * CGameInfoCallback::getArtSet(const ArtifactLocation & loc) const const CArtifactSet * CGameInfoCallback::getArtSet(const ArtifactLocation & loc) const

13
server/CGameHandler.cpp
View File

@@ -1861,12 +1861,8 @@ bool CGameHandler::bulkSmartSplitStack(SlotID slotSrc, ObjectInstanceID srcOwner
bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player) bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player)
{ {
const CArmedInstance * s1 = static_cast<const CArmedInstance *>(getObjInstance(id1)); const CArmedInstance * s1 = static_cast<const CArmedInstance *>(getObj(id1));
const CArmedInstance * s2 = static_cast<const CArmedInstance *>(getObjInstance(id2)); const CArmedInstance * s2 = static_cast<const CArmedInstance *>(getObj(id2));
const CCreatureSet & S1 = *s1;
const CCreatureSet & S2 = *s2;
StackLocation sl1(s1, p1);
StackLocation sl2(s2, p2);
if (s1 == nullptr || s2 == nullptr) if (s1 == nullptr || s2 == nullptr)
{ {
@@ -1874,6 +1870,11 @@ bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8
return false; return false;
} }
const CCreatureSet & S1 = *s1;
const CCreatureSet & S2 = *s2;
StackLocation sl1(s1, p1);
StackLocation sl2(s2, p2);
if (!sl1.slot.validSlot() || !sl2.slot.validSlot()) if (!sl1.slot.validSlot() || !sl2.slot.validSlot())
{ {
complain(complainInvalidSlot); complain(complainInvalidSlot);