games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'vcmi/beta' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-12 17:28:47 +03:00
parent ad8695ac91 92ce97bbc7
commit f13a53c1d9
95 changed files with 1628 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/widgets/CGarrisonInt.cpp
View File

@@ -17,6 +17,7 @@
#include "../gui/CGuiHandler.h"
#include "../gui/WindowHandler.h"
#include "../render/IImage.h"
#include "../render/Graphics.h"
#include "../windows/CCreatureWindow.h"
#include "../windows/GUIClasses.h"
#include "../CGameInfo.h"
@@ -422,10 +423,10 @@ CGarrisonSlot::CGarrisonSlot(CGarrisonInt * Owner, int x, int y, SlotID IID, EGa
std::string imgName = owner->smallIcons ? "cprsmall" : "TWCRPORT";
creatureImage = std::make_shared<CAnimImage>(imgName, 0);
creatureImage = std::make_shared<CAnimImage>(graphics->getAnimation(imgName), 0);
creatureImage->disable();
selectionImage = std::make_shared<CAnimImage>(imgName, 1);
selectionImage = std::make_shared<CAnimImage>(graphics->getAnimation(imgName), 1);
selectionImage->disable();
if(Owner->smallIcons)