From aa1c193b88f487ce7e5d2d43869789b2fd6e7c6b Mon Sep 17 00:00:00 2001 From: beegee1 Date: Sat, 2 Nov 2013 20:07:45 +0000 Subject: [PATCH] Fixed mantis #1582 --- client/battle/CBattleInterface.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp index a20b44cee..c91a678a3 100644 --- a/client/battle/CBattleInterface.cpp +++ b/client/battle/CBattleInterface.cpp @@ -1679,14 +1679,14 @@ void CBattleInterface::setHoveredStack(const CStack * stack) void CBattleInterface::activateStack() { + myTurn = true; + if(!!attackerInt && defenderInt) //hotseat -> need to pick which interface "takes over" as active + curInt = attackerInt->playerID == stackToActivate->owner ? attackerInt : defenderInt; + setActiveStack(stackToActivate); stackToActivate = nullptr; const CStack *s = activeStack; - myTurn = true; - if(!!attackerInt && defenderInt) //hotseat -> need to pick which interface "takes over" as active - curInt = attackerInt->playerID == s->owner ? attackerInt : defenderInt; - queue->update(); redrawBackgroundWithHexes(activeStack); @@ -3672,4 +3672,4 @@ void CBattleInterface::showPiecesOfWall(SDL_Surface * to, std::vector piece } } } -} \ No newline at end of file +}