1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00

Merge pull request #163 from vmarkovtsev/issue/2358

Fix 2358 swapped garrison <-> visiting status text
This commit is contained in:
ArseniyShestakov 2016-01-21 10:37:51 +03:00
commit b351c0816f

View File

@ -73,11 +73,11 @@ void CGarrisonSlot::hover (bool on)
{
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))
{
temp = CGI->generaltexth->tcommands[12]; //Select %s (in garrison)
temp = CGI->generaltexth->tcommands[32]; //Select %s (visiting)
}
else
{