games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Hero description in tavern is invariant, so move it into its constructor instead of recreating it for every frame.

Browse Source
This commit is contained in:
Frank Zago
2009-05-30 15:58:28 +00:00
parent e3bfc51328
commit 5b25b21a15
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/GUIClasses.cpp
View File

@@ -2871,14 +2871,9 @@ void CTavernWindow::show(SDL_Surface * to)
if(selected >= 0) if(selected >= 0)
{ {
HeroPortrait *sel = selected ? &h2 : &h1; HeroPortrait *sel = selected ? &h2 : &h1;
char descr[300]; HeroPortrait *other = selected ? &h1 : &h2;
int artifs = sel->h->artifWorn.size()+sel->h->artifacts.size();
for(int i=13; i<=17; i++) //war machines and spellbook doesn't count printAtMiddleWB(sel->descr,pos.x+146,pos.y+389,GEOR13,40,zwykly,to);
if(vstd::contains(sel->h->artifWorn,i))
artifs--;
sprintf_s(descr,300,CGI->generaltexth->allTexts[215].c_str(),
sel->h->name.c_str(),sel->h->level,sel->h->type->heroClass->name.c_str(),artifs);
printAtMiddleWB(descr,pos.x+146,pos.y+389,GEOR13,40,zwykly,to);
CSDL_Ext::drawBorder(to,sel->pos.x-2,sel->pos.y-2,sel->pos.w+4,sel->pos.h+4,int3(247,223,123)); CSDL_Ext::drawBorder(to,sel->pos.x-2,sel->pos.y-2,sel->pos.w+4,sel->pos.h+4,int3(247,223,123));
} }
} }
@@ -2922,6 +2917,14 @@ CTavernWindow::HeroPortrait::HeroPortrait(int &sel, int id, int x, int y, const
hoverName = CGI->generaltexth->tavernInfo[4]; hoverName = CGI->generaltexth->tavernInfo[4];
boost::algorithm::replace_first(hoverName,"%s",H->name); boost::algorithm::replace_first(hoverName,"%s",H->name);
} }
int artifs = h->artifWorn.size() + h->artifacts.size();
for(int i=13; i<=17; i++) //war machines and spellbook don't count
if(vstd::contains(h->artifWorn,i))
artifs--;
sprintf_s(descr, sizeof(descr),CGI->generaltexth->allTexts[215].c_str(),
h->name.c_str(), h->level, h->type->heroClass->name.c_str(), artifs);
descr[sizeof(descr)-1] = '\0';
} }
void CTavernWindow::HeroPortrait::show(SDL_Surface * to) void CTavernWindow::HeroPortrait::show(SDL_Surface * to)

1
client/GUIClasses.h
View File

@@ -508,6 +508,7 @@ public:
void hover (bool on); void hover (bool on);
HeroPortrait(int &sel, int id, int x, int y, const CGHeroInstance *H); HeroPortrait(int &sel, int id, int x, int y, const CGHeroInstance *H);
void show(SDL_Surface * to); void show(SDL_Surface * to);
char descr[100]; // "XXX is a level Y ZZZ with N artifacts"
} h1, h2; //recruitable heroes } h1, h2; //recruitable heroes
SDL_Surface *bg; //background SDL_Surface *bg; //background