games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

Browse Source
This commit is contained in:
DjWarmonger
2016-08-30 07:51:41 +02:00
parent 6791350975 7e0c4e1451
commit f686e4fe80
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CPreGame.cpp
View File

@@ -1284,7 +1284,7 @@ SelectionTab::SelectionTab(CMenuScreen::EState Type, const std::function<void(CM
slider = new CSlider(Point(372, 86), tabType != CMenuScreen::saveGame ? 480 : 430, std::bind(&SelectionTab::sliderMove, this, _1), positions, curItems.size(), 0, false, CSlider::BLUE); slider = new CSlider(Point(372, 86), tabType != CMenuScreen::saveGame ? 480 : 430, std::bind(&SelectionTab::sliderMove, this, _1), positions, curItems.size(), 0, false, CSlider::BLUE);
slider->addUsedEvents(WHEEL); slider->addUsedEvents(WHEEL);
formatIcons = new CAnimation("SCSELC.DEF"); formatIcons = make_unique<CAnimation>("SCSELC.DEF");
formatIcons->load(); formatIcons->load();
sortingBy = _format; sortingBy = _format;
@@ -1314,7 +1314,7 @@ SelectionTab::SelectionTab(CMenuScreen::EState Type, const std::function<void(CM
SelectionTab::~SelectionTab() SelectionTab::~SelectionTab()
{ {
delete formatIcons;
} }
void SelectionTab::sortBy( int criteria ) void SelectionTab::sortBy( int criteria )

2
client/CPreGame.h
View File

@@ -149,7 +149,7 @@ public:
class SelectionTab : public CIntObject class SelectionTab : public CIntObject
{ {
private: private:
CAnimation * formatIcons; std::unique_ptr<CAnimation> formatIcons;
void parseMaps(const std::unordered_set<ResourceID> &files); void parseMaps(const std::unordered_set<ResourceID> &files);
void parseGames(const std::unordered_set<ResourceID> &files, bool multi); void parseGames(const std::unordered_set<ResourceID> &files, bool multi);