games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Cleanup & formatting

Browse Source
This commit is contained in:
AlexVinS
2017-07-04 01:32:40 +03:00
parent dfbc9cea8a
commit dbaf3cb023
6 changed files with 41 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/windows/GUIClasses.cpp
View File

@@ -1744,26 +1744,6 @@ CObjectListWindow::CObjectListWindow(const std::vector<int> &_items, CIntObject
init(titlePic, _title, _descr);
}
CObjectListWindow::CObjectListWindow(const std::vector<int> &_items, const Component & titlePic, std::string _title, std::string _descr,
std::function<void(int)> Callback):
CWindowObject(PLAYER_COLORED, "TPGATE"),
onSelect(Callback),
selected(0)
{
items.reserve(_items.size());
for(int id : _items)
{
items.push_back(std::make_pair(id, CGI->mh->map->objects[id]->getObjectName()));
}
OBJ_CONSTRUCTION_CAPTURING_ALL;
CComponent * icon = new CComponent(titlePic);
init(icon, _title, _descr);
}
CObjectListWindow::CObjectListWindow(const std::vector<std::string> &_items, CIntObject * titlePic, std::string _title, std::string _descr,
std::function<void(int)> Callback):
CWindowObject(PLAYER_COLORED, "TPGATE"),