1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-07 23:33:15 +02:00

Started making hot-seat GUI. Accompanying changes to rest of GUI.

This commit is contained in:
Michał W. Urbańczyk
2010-02-15 06:54:57 +00:00
parent 415266279e
commit da87d25d21
12 changed files with 375 additions and 131 deletions

View File

@@ -178,9 +178,9 @@ void AdventureMapButton::hover (bool on)
std::string *name = (vstd::contains(hoverTexts,state))
? (&hoverTexts[state])
: (vstd::contains(hoverTexts,0) ? (&hoverTexts[0]) : NULL);
if(LOCPLINT && name && name->size() && blocked!=1) //if there is no name, there is nohing to display also
if(name && name->size() && blocked!=1) //if there is no name, there is nohing to display also
{
if (LOCPLINT->battleInt) //for battle buttons
if (LOCPLINT && LOCPLINT->battleInt) //for battle buttons
{
if(on && LOCPLINT->battleInt->console->alterTxt == "")
{
@@ -193,12 +193,12 @@ void AdventureMapButton::hover (bool on)
LOCPLINT->battleInt->console->whoSetAlter = 0;
}
}
else //for other buttons
else if(GH.statusbar) //for other buttons
{
if (on)
LOCPLINT->statusbar->print(*name);
else if ( LOCPLINT->statusbar->getCurrent()==(*name) )
LOCPLINT->statusbar->clear();
GH.statusbar->print(*name);
else if ( GH.statusbar->getCurrent()==(*name) )
GH.statusbar->clear();
}
}
}