1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00

Further part of external dwellings handling. Still not done.

Redone MetaString.
This commit is contained in:
Michał W. Urbańczyk
2009-07-09 19:15:22 +00:00
parent 83791aa3e1
commit 1d816b2eb9
11 changed files with 312 additions and 122 deletions

View File

@@ -262,7 +262,8 @@ void InfoWindow::applyCl( CClient *cl )
{
comps.push_back(&components[i]);
}
std::string str = toString(text);
std::string str;
text.toString(str);
if(vstd::contains(cl->playerint,player))
cl->playerint[player]->showInfoDialog(str,comps,(soundBase::soundID)soundID);
@@ -282,7 +283,9 @@ void HeroLevelUp::applyCl( CClient *cl )
void BlockingDialog::applyCl( CClient *cl )
{
std::string str = toString(text);
std::string str;
text.toString(str);
if(vstd::contains(cl->playerint,player))
cl->playerint[player]->showBlockingDialog(str,components,id,(soundBase::soundID)soundID,selection(),cancel());
else
@@ -452,7 +455,7 @@ void PlayerMessage::applyCl(CClient *cl)
void ShowInInfobox::applyCl(CClient *cl)
{
SComponent sc(c);
sc.description = toString(text);
text.toString(sc.description);
if(cl->playerint[player]->human)
{
static_cast<CPlayerInterface*>(cl->playerint[player])->showComp(sc);