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

fixes

Browse Source
This commit is contained in:
AlexVinS 2017-12-21 21:27:39 +03:00
parent f82fd41a14
commit 368ba0e2bf
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/VCMI_client.cbp
View File

@ -200,8 +200,8 @@
<Unit filename="windows/CTradeWindow.h" /> <Unit filename="windows/CTradeWindow.h" />
<Unit filename="windows/CWindowObject.cpp" /> <Unit filename="windows/CWindowObject.cpp" />
<Unit filename="windows/CWindowObject.h" /> <Unit filename="windows/CWindowObject.h" />
<Unit filename="windows/CreaturePurhaseCard.cpp" /> <Unit filename="windows/CreaturePurchaseCard.cpp" />
<Unit filename="windows/CreaturePurhaseCard.h" /> <Unit filename="windows/CreaturePurchaseCard.h" />
<Unit filename="windows/GUIClasses.cpp" /> <Unit filename="windows/GUIClasses.cpp" />
<Unit filename="windows/GUIClasses.h" /> <Unit filename="windows/GUIClasses.h" />
<Unit filename="windows/InfoWindows.cpp" /> <Unit filename="windows/InfoWindows.cpp" />

7
client/windows/CreaturePurchaseCard.cpp
View File

@ -1,5 +1,5 @@
/* /*
* CreaturePurhaseCard.cpp, part of VCMI engine * CreaturePurchaseCard.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *
@ -82,7 +82,10 @@ void CreaturePurchaseCard::sliderMoved(int to)
parent->updateAllSliders(); parent->updateAllSliders();
} }
CreaturePurchaseCard::CreaturePurchaseCard(const std::vector<CreatureID> & creaturesID, Point position, int creaturesMaxAmount, QuickRecruitmentWindow * parents) : upgradesID(creaturesID), parent(parents), maxAmount(creaturesMaxAmount) CreaturePurchaseCard::CreaturePurchaseCard(const std::vector<CreatureID> & creaturesID, Point position, int creaturesMaxAmount, QuickRecruitmentWindow * parents)
: upgradesID(creaturesID),
parent(parents),
maxAmount(creaturesMaxAmount)
{ {
creatureOnTheCard = upgradesID.back().toCreature(); creatureOnTheCard = upgradesID.back().toCreature();
moveTo(Point(position.x, position.y)); moveTo(Point(position.x, position.y));

4
client/windows/CreaturePurchaseCard.h
View File

@ -1,5 +1,5 @@
/* /*
* CreaturePurhaseCard.h, part of VCMI engine * CreaturePurchaseCard.h, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *
@ -46,5 +46,5 @@ private:
std::shared_ptr<CLabel> availableAmount, purhaseAmount; std::shared_ptr<CLabel> availableAmount, purhaseAmount;
std::shared_ptr<CCreaturePic> picture; std::shared_ptr<CCreaturePic> picture;
std::shared_ptr<CreatureCostBox> cost; std::shared_ptr<CreatureCostBox> cost;
const std::vector<CreatureID> & upgradesID; std::vector<CreatureID> upgradesID;
}; };

3
client/windows/QuickRecruitmentWindow.cpp
View File

@ -145,7 +145,8 @@ void QuickRecruitmentWindow::updateAllSliders()
} }
QuickRecruitmentWindow::QuickRecruitmentWindow(const CGTownInstance * townd, Rect startupPosition) QuickRecruitmentWindow::QuickRecruitmentWindow(const CGTownInstance * townd, Rect startupPosition)
: CWindowObject(PLAYER_COLORED | BORDERED), town(townd) : CWindowObject(PLAYER_COLORED | BORDERED),
town(townd)
{ {
OBJECT_CONSTRUCTION_CAPTURING(ACTIVATE + DEACTIVATE + UPDATE + SHOWALL); OBJECT_CONSTRUCTION_CAPTURING(ACTIVATE + DEACTIVATE + UPDATE + SHOWALL);