mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-06 09:09:40 +02:00
* "%s substitutions in Right-click information in town hall
* windmill won't give wood * hover text for heroes * good background for the town hall screen in Stronghold * fixed typo in hall.txt * support for ZSoft-style PCX files in /Data (using SDL_image) * minor improvements
This commit is contained in:
@@ -656,7 +656,11 @@ void CHallInterface::CBuildingBox::hover(bool on)
|
||||
Hoverable::hover(on);
|
||||
if(on)
|
||||
{
|
||||
std::string toPrint = CGI->townh->hcommands[state];
|
||||
std::string toPrint;
|
||||
if(state==8)
|
||||
toPrint = CGI->townh->hcommands[5];
|
||||
else
|
||||
toPrint = CGI->townh->hcommands[state];
|
||||
std::vector<std::string> name;
|
||||
name.push_back(CGI->buildh->buildings[LOCPLINT->castleInt->town->subID][BID]->name);
|
||||
LOCPLINT->statusbar->print(CSDL_Ext::processStr(toPrint,name));
|
||||
@@ -929,7 +933,7 @@ std::string CHallInterface::CBuildWindow::getTextForState(int state)
|
||||
ret = CGI->townh->hcommands[state];
|
||||
switch (state)
|
||||
{
|
||||
case 4:
|
||||
case 4: case 5: case 6:
|
||||
ret.replace(ret.find_first_of("%s"),2,CGI->buildh->buildings[tid][bid]->name);
|
||||
break;
|
||||
case 7:
|
||||
|
||||
Reference in New Issue
Block a user