games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

* fixed remaining parts of #760

Browse Source 
* it's possible to switch active creature during tacts phase by clicking on stack
* a few minor fixes after handleHex rewrite
This commit is contained in:
Michał W. Urbańczyk
2012-04-02 23:23:14 +00:00
parent 584b761d37
commit c61f536d8b
6 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/CPlayerInterface.cpp
View File

@@ -729,8 +729,10 @@ void CPlayerInterface::actionFinished(const BattleAction* action)
BattleAction CPlayerInterface::activeStack(const CStack * stack) //called when it's turn of that stack
{
tlog5 << "Awaiting command for " << stack->nodeName() << std::endl;
CBattleInterface *b = battleInt;
assert(!b->givenCommand->get()); //command buffer must be clean (we don't want to use old command)
{
boost::unique_lock<boost::recursive_mutex> un(*pim);
b->stackActivated(stack);
@@ -751,6 +753,7 @@ BattleAction CPlayerInterface::activeStack(const CStack * stack) //called when i
b->givenCommand->data = NULL;
//return command
tlog5 << "Giving command for " << stack->nodeName() << std::endl;
return ret;
}