games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Merge pull request #163 from vmarkovtsev/issue/2358

Browse Source 
Fix 2358 swapped garrison <-> visiting status text
This commit is contained in:
ArseniyShestakov 2016-01-21 10:37:51 +03:00
commit b351c0816f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/widgets/CGarrisonInt.cpp
View File

@ -73,11 +73,11 @@ void CGarrisonSlot::hover (bool on)
{ {
if(upg == EGarrisonType::UP) if(upg == EGarrisonType::UP)
{ {
temp = CGI->generaltexth->tcommands[32]; //Select %s (visiting) temp = CGI->generaltexth->tcommands[12]; //Select %s (in garrison)
} }
else if(owner->armedObjs[0] && (owner->armedObjs[0]->ID == Obj::TOWN || owner->armedObjs[0]->ID == Obj::HERO)) else if(owner->armedObjs[0] && (owner->armedObjs[0]->ID == Obj::TOWN || owner->armedObjs[0]->ID == Obj::HERO))
{ {
temp = CGI->generaltexth->tcommands[12]; //Select %s (in garrison) temp = CGI->generaltexth->tcommands[32]; //Select %s (visiting)
} }
else else
{ {