games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Fixed #674, #675, #676, #677.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-02-25 17:57:30 +00:00
parent 2f4aabca52
commit 236345e61d
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CPlayerInterface.cpp
View File

@ -123,7 +123,7 @@ CPlayerInterface::~CPlayerInterface()
{
howManyPeople--;
//delete pim;
delNull(pim);
//delNull(pim);
delete showingDialog;
delete mainFPSmng;
if(adventureInt)
@ -481,19 +481,13 @@ void CPlayerInterface::heroInGarrisonChange(const CGTownInstance *town)
wanderingHeroes.push_back(town->visitingHero);
}
//adventureInt->heroList.updateHList();
CCastleInterface *c = castleInt;
if(c)
if(CCastleInterface *c = castleInt)
{
c->garr->highlighted = NULL;
c->hslotup.hero = town->garrisonHero;
c->hslotdown.hero = town->visitingHero;
const CArmedInstance *upperArmy = town;
if(town->garrisonHero)
upperArmy = town->garrisonHero;
c->garr->setArmy(upperArmy, 0);
c->garr->setArmy(town->getUpperArmy(), 0);
c->garr->setArmy(town->visitingHero, 1);
c->garr->recreateSlots();
}