games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-27 21:49:10 +02:00
Code Issues Releases Activity

Merge pull request #218 from vmarkovtsev/fix-morale-widget

Browse Source 
Nice and clean fix.
This commit is contained in:
DjWarmonger 2016-09-19 20:44:13 +02:00 committed by GitHub
commit 264c71c58a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/CHeroWindow.cpp
View File

@ -344,6 +344,12 @@ void CHeroWindow::commanderWindow()
}
void CHeroWindow::updateGarrisons()
{
CWindowWithGarrison::updateGarrisons();
morale->set(&heroWArt);
}
void CHeroWindow::showAll(SDL_Surface * to)
{
CIntObject::showAll(to);

1
client/windows/CHeroWindow.h
View File

@ -91,6 +91,7 @@ public:
void questlog(); //show quest log in hero window
void commanderWindow();
void switchHero(); //changes displayed hero
virtual void updateGarrisons() override; //updates the morale widget and calls the parent
//friends
friend void CArtPlace::clickLeft(tribool down, bool previousState);