games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +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-11-25 18:59:33 +01:00
commit d252265824
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/GUIClasses.cpp
View File

@ -1732,7 +1732,8 @@ void CObjectListWindow::CItem::clickLeft(tribool down, bool previousState)
CObjectListWindow::CObjectListWindow(const std::vector<int> &_items, CIntObject * titlePic, std::string _title, std::string _descr, CObjectListWindow::CObjectListWindow(const std::vector<int> &_items, CIntObject * titlePic, std::string _title, std::string _descr,
std::function<void(int)> Callback): std::function<void(int)> Callback):
CWindowObject(PLAYER_COLORED, "TPGATE"), CWindowObject(PLAYER_COLORED, "TPGATE"),
onSelect(Callback) onSelect(Callback),
selected(0)
{ {
items.reserve(_items.size()); items.reserve(_items.size());
for(int id : _items) for(int id : _items)
@ -1746,7 +1747,8 @@ CObjectListWindow::CObjectListWindow(const std::vector<int> &_items, CIntObject
CObjectListWindow::CObjectListWindow(const std::vector<std::string> &_items, CIntObject * titlePic, std::string _title, std::string _descr, CObjectListWindow::CObjectListWindow(const std::vector<std::string> &_items, CIntObject * titlePic, std::string _title, std::string _descr,
std::function<void(int)> Callback): std::function<void(int)> Callback):
CWindowObject(PLAYER_COLORED, "TPGATE"), CWindowObject(PLAYER_COLORED, "TPGATE"),
onSelect(Callback) onSelect(Callback),
selected(0)
{ {
items.reserve(_items.size()); items.reserve(_items.size());