games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

* small bugfix in dismissing hero (still needs better actualization of advmap lists)

Browse Source 
* most buttons in battleInterface
This commit is contained in:
mateuszb 2008-03-01 11:49:25 +00:00
parent 17d5d298ca
commit 68d37e1507
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AdventureMapButton.h
View File

@ -96,11 +96,14 @@ void AdventureMapButton<T>::clickRight (tribool down)
template <typename T>
void AdventureMapButton<T>::hover (bool on)
{
Hoverable::hover(on);
if (on)
LOCPLINT->statusbar->print(name);
else if (LOCPLINT->statusbar->getCurrent()==name)
LOCPLINT->statusbar->clear();
if(name.size()) //if there is no name, there is nohing to display also
{
Hoverable::hover(on);
if (on)
LOCPLINT->statusbar->print(name);
else if (LOCPLINT->statusbar->getCurrent()==name)
LOCPLINT->statusbar->clear();
}
}
template <typename T>
void AdventureMapButton<T>::activate()

26
CBattleInterface.cpp
View File

@ -17,6 +17,12 @@ CBattleInterface::CBattleInterface(CCreatureSet * army1, CCreatureSet * army2, i
CSDL_Ext::update();
bOptions = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bOptionsf, 3, 561, "icm003.def", this, false, NULL, false);
bSurrender = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bSurrenderf, 54, 561, "icm001.def", this, false, NULL, false);
bFlee = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bFleef, 105, 561, "icm002.def", this, false, NULL, false);
bAutofight = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bAutofightf, 157, 561, "icm004.def", this, false, NULL, false);
bSpell = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bSpellf, 645, 561, "icm005.def", this, false, NULL, false);
bWait = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bWaitf, 696, 561, "icm006.def", this, false, NULL, false);
bDefence = new AdventureMapButton<CBattleInterface> (std::string(), std::string(), &CBattleInterface::bDefencef, 747, 561, "icm007.def", this, false, NULL, false);
//bOptions->activate();
}
@ -24,17 +30,35 @@ CBattleInterface::~CBattleInterface()
{
SDL_FreeSurface(background);
SDL_FreeSurface(menu);
//delete
delete bOptions;
delete bSurrender;
delete bFlee;
delete bAutofight;
delete bSpell;
delete bWait;
delete bDefence;
}
void CBattleInterface::activate()
{
bOptions->activate();
bSurrender->activate();
bFlee->activate();
bAutofight->activate();
bSpell->activate();
bWait->activate();
bDefence->activate();
}
void CBattleInterface::deactivate()
{
bOptions->deactivate();
bSurrender->deactivate();
bFlee->deactivate();
bAutofight->deactivate();
bSpell->deactivate();
bWait->deactivate();
bDefence->deactivate();
}
void CBattleInterface::show(SDL_Surface * to)

3
CHeroWindow.cpp
View File

@ -639,8 +639,9 @@ void CHeroWindow::deactivate()
void CHeroWindow::dismissCurrent()
{
LOCPLINT->cb->dismissHero(curHero);
const CGHeroInstance * ch = curHero;
quit();
LOCPLINT->cb->dismissHero(ch);
}
void CHeroWindow::questlog()