games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-23 21:29:13 +02:00
Code Issues Releases Activity

Fix compile after merge

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-02 00:06:57 +02:00
parent 495e0b3657
commit 215932b520
4 changed files with 7 additions and 3 deletions

1
client/battle/CBattleInterface.cpp

@ -188,7 +188,6 @@ CBattleInterface::CBattleInterface(const CCreatureSet *army1, const CCreatureSet
addUsedEvents(RCLICK | MOVE | KEYBOARD);
controlPanel->blockUI(true);
queue->update();
blockUI(true);
}
CBattleInterface::~CBattleInterface()

2
client/battle/CBattleInterfaceClasses.cpp

@ -696,7 +696,7 @@ void CStackQueue::update()
int32_t CStackQueue::getSiegeShooterIconID()
{
return owner->siegeH->town->town->faction->index;
return owner->siegeController->getSiegedTown()->town->faction->index;
}
CStackQueue::StackBox::StackBox(CStackQueue * owner):

5
client/battle/CBattleSiegeController.cpp

@ -350,3 +350,8 @@ void CBattleSiegeController::stackIsCatapulting(const CatapultAttack & ca)
wallPieceImages[wallId] = IImage::createFromFile(getWallPieceImageName(EWallVisual::EWallVisual(wallId), wallState));
}
}
const CGTownInstance *CBattleSiegeController::getSiegedTown() const
{
return town;
}

2
client/battle/CBattleSiegeController.h

@ -106,5 +106,5 @@ public:
const CCreature *getTurretCreature() const;
Point getTurretCreaturePosition( BattleHex position ) const;
const CGTownInstance *getSiegedTown() const;
};