1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

* resting in town with mage guild will replenih all the mana points

* battle will end when one side has only war machines
* fixed crasbug occurring on revisiting objects (by pressing space)
* started writing support for artifacts
This commit is contained in:
Michał W. Urbańczyk
2009-04-03 22:34:31 +00:00
parent f794644c2a
commit 1983aee1b2
16 changed files with 447 additions and 153 deletions

View File

@ -1214,7 +1214,7 @@ void CPlayerInterface::yourTurn()
pim->unlock();
SDL_framerateDelay(mainFPSmng);
}
adventureInt->hide();
adventureInt->deactivate();
cb->endTurn();
}
@ -1785,7 +1785,7 @@ void CPlayerInterface::heroCreated(const CGHeroInstance * hero)
}
void CPlayerInterface::openTownWindow(const CGTownInstance * town)
{
adventureInt->hide();
adventureInt->deactivate();
//timeHandler t;
//t.getDif();
castleInt = new CCastleInterface(town,true);
@ -2035,7 +2035,7 @@ void CPlayerInterface::showSelDialog(const std::string &text, const std::vector<
{
boost::unique_lock<boost::recursive_mutex> un(*pim);
LOCPLINT->showingDialog->setn(true);
adventureInt->hide(); //dezaktywacja starego interfejsu
adventureInt->deactivate(); //dezaktywacja starego interfejsu
std::vector<CSelectableComponent*> intComps;
for(int i=0;i<components.size();i++)
intComps.push_back(new CSelectableComponent(*components[i])); //will be deleted by CSelWindow::close