games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-13 23:57:41 +02:00
Code Issues Releases Activity

- partial implementation of kingdom overview:

Browse Source 
-- moved some kingdom overview values to config
-- small fix to garrison window
-- small fix to button class
This commit is contained in:
Ivan Savenko
2010-01-30 19:08:26 +00:00
parent 83e91430a7
commit 6f0f6564d7
7 changed files with 483 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/AdventureMapButton.cpp
View File

@@ -55,8 +55,8 @@ void CButtonBase::show(SDL_Surface * to)
{
blitAt(imgs[curimg][img],pos.x,pos.y,to);
if(text)
{
CSDL_Ext::printAt(text->text, text->x + pos.x + state, text->y + pos.y + state, text->font, zwykly, to);
{//using "state" instead of "state == 1" screwed up hoverable buttons with text
CSDL_Ext::printAt(text->text, text->x + pos.x + (state == 1), text->y + pos.y + (state == 1), text->font, text->color, to);
}
}
else
@@ -70,7 +70,7 @@ void CButtonBase::showAll( SDL_Surface * to )
show(to);
}
void CButtonBase::addTextOverlay( const std::string Text, EFonts font )
void CButtonBase::addTextOverlay( const std::string Text, EFonts font, SDL_Color color)
{
text = new TextOverlay;
text->text = Text;
@@ -78,7 +78,8 @@ void CButtonBase::addTextOverlay( const std::string Text, EFonts font )
const Font *f = graphics->fonts[font];
text->x = pos.w/2 - f->getWidth(Text.c_str())/2;
text->y = pos.h/2 - f->height/2;
text->font = font;
text->font = font;
text->color = color;
}