games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

* version set 0.73b

Browse Source 
* config entry for 1600x1200 resolution
* several fixes
* http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=3185#3185
This commit is contained in:
Michał W. Urbańczyk
2009-08-03 23:53:18 +00:00
parent b987f02cb0
commit de1ed92379
21 changed files with 388 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
AI/GeniusAI/CGeniusAI.cpp
View File

@ -25,7 +25,7 @@ void DbgBox(const char *msg, bool messageBox)
}
CGeniusAI::CGeniusAI()
: m_generalAI(),turn(0),firstTurn(true)
: m_generalAI(), turn(0), m_state(NO_BATTLE), firstTurn(true)
{
}
@ -272,6 +272,20 @@ void GeniusAI::CGeniusAI::showGarrisonDialog( const CArmedInstance *up, const CG
onEnd();
}
void GeniusAI::CGeniusAI::playerBlocked( int reason )
{
if(reason == 0) //battle is coming...
{
m_state.setn(UPCOMING_BATTLE);
}
}
void GeniusAI::CGeniusAI::battleResultsApplied()
{
assert(m_state.get() == ENDING_BATTLE);
m_state.setn(NO_BATTLE);
}
void CGeniusAI::showBlockingDialog(const std::string &text, const std::vector<Component> &components, ui32 askID, const int soundID, bool selection, bool cancel)
{
m_cb->selectionMade(cancel ? 0 : 1, askID);
@ -321,7 +335,10 @@ void CGeniusAI::battleStacksAttacked(std::set<BattleStackAttacked> & bsa)
void CGeniusAI::battleStart(CCreatureSet *army1, CCreatureSet *army2, int3 tile, CGHeroInstance *hero1, CGHeroInstance *hero2, bool side)
{
assert(!m_battleLogic); //************** assert fails when AI starts two battles at same time? ***************
assert(!m_battleLogic);
assert(playerID > PLAYER_LIMIT || m_state.get() == UPCOMING_BATTLE); //we have been informed that battle will start (or we are neutral AI)
m_state.setn(ONGOING_BATTLE);
m_battleLogic = new BattleAI::CBattleLogic(m_cb, army1, army2, tile, hero1, hero2, side);
DbgBox("** CGeniusAI::battleStart **");
@ -341,6 +358,9 @@ void CGeniusAI::battleEnd(BattleResult *br)
delete m_battleLogic;
m_battleLogic = NULL;
assert(m_state.get() == ONGOING_BATTLE);
m_state.setn(ENDING_BATTLE);
DbgBox("** CGeniusAI::battleEnd **");
}
/**