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

code review

Browse Source
This commit is contained in:
Laserlicht
2025-11-18 21:46:03 +01:00
parent 81ee046cc1
commit 2571ca4aed
2 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
client/lobby/RandomMapTab.cpp
View File

@@ -54,37 +54,7 @@ RandomMapTab::RandomMapTab():
addCallback("toggleMapSize", [this](int btnId) addCallback("toggleMapSize", [this](int btnId)
{ {
if(btnId == -1) onToggleMapSize(btnId);
return;
auto mapSizeVal = getPossibleMapSizes();
auto setTemplateForSize = [this](){
if(mapGenOptions->getMapTemplate())
if(!mapGenOptions->getMapTemplate()->matchesSize(int3{mapGenOptions->getWidth(), mapGenOptions->getHeight(), mapGenOptions->getLevels()}))
setTemplate(nullptr);
updateMapInfoByHost();
};
if(btnId == mapSizeVal.size() - 1)
{
ENGINE->windows().createAndPushWindow<SetSizeWindow>(int3(mapGenOptions->getWidth(), mapGenOptions->getHeight(), mapGenOptions->getLevels()), [this, setTemplateForSize](int3 ret){
if(ret.z > 2)
{
std::shared_ptr<CInfoWindow> temp = CInfoWindow::create(LIBRARY->generaltexth->translate("vcmi.lobby.customRmgSize.experimental"), PlayerColor(0), {}); //TODO: multilevel support
ENGINE->windows().pushWindow(temp);
}
mapGenOptions->setWidth(ret.x);
mapGenOptions->setHeight(ret.y);
mapGenOptions->setLevels(ret.z);
setTemplateForSize();
});
return;
}
mapGenOptions->setWidth(mapSizeVal[btnId]);
mapGenOptions->setHeight(mapSizeVal[btnId]);
setTemplateForSize();
}); });
addCallback("toggleTwoLevels", [&](bool on) addCallback("toggleTwoLevels", [&](bool on)
{ {
@@ -225,6 +195,41 @@ RandomMapTab::RandomMapTab():
loadOptions(); loadOptions();
} }
void RandomMapTab::onToggleMapSize(int btnId)
{
if(btnId == -1)
return;
auto mapSizeVal = getStandardMapSizes();
auto setTemplateForSize = [this](){
if(mapGenOptions->getMapTemplate())
if(!mapGenOptions->getMapTemplate()->matchesSize(int3{mapGenOptions->getWidth(), mapGenOptions->getHeight(), mapGenOptions->getLevels()}))
setTemplate(nullptr);
updateMapInfoByHost();
};
if(btnId == mapSizeVal.size() - 1)
{
ENGINE->windows().createAndPushWindow<SetSizeWindow>(int3(mapGenOptions->getWidth(), mapGenOptions->getHeight(), mapGenOptions->getLevels()), [this, setTemplateForSize](int3 ret){
if(ret.z > 2)
{
std::shared_ptr<CInfoWindow> temp = CInfoWindow::create(LIBRARY->generaltexth->translate("vcmi.lobby.customRmgSize.experimental"), PlayerColor(0), {}); //TODO: multilevel support
ENGINE->windows().pushWindow(temp);
}
mapGenOptions->setWidth(ret.x);
mapGenOptions->setHeight(ret.y);
mapGenOptions->setLevels(ret.z);
setTemplateForSize();
});
return;
}
mapGenOptions->setWidth(mapSizeVal[btnId]);
mapGenOptions->setHeight(mapSizeVal[btnId]);
setTemplateForSize();
}
void RandomMapTab::updateMapInfoByHost() void RandomMapTab::updateMapInfoByHost()
{ {
if(GAME->server().isGuest()) if(GAME->server().isGuest())
@@ -372,7 +377,7 @@ void RandomMapTab::setMapGenOptions(std::shared_ptr<CMapGenOptions> opts)
if(auto w = widget<CToggleGroup>("groupMapSize")) if(auto w = widget<CToggleGroup>("groupMapSize"))
{ {
const auto & mapSizes = getPossibleMapSizes(); const auto & mapSizes = getStandardMapSizes();
for(auto toggle : w->buttons) for(auto toggle : w->buttons)
{ {
if(auto button = std::dynamic_pointer_cast<CToggleButton>(toggle.second)) if(auto button = std::dynamic_pointer_cast<CToggleButton>(toggle.second))
@@ -383,7 +388,7 @@ void RandomMapTab::setMapGenOptions(std::shared_ptr<CMapGenOptions> opts)
button->block(!sizeAllowed && !(toggle.first == mapSizes.size() - 1)); button->block(!sizeAllowed && !(toggle.first == mapSizes.size() - 1));
} }
} }
auto position = vstd::find_pos(getPossibleMapSizes(), opts->getWidth()); auto position = vstd::find_pos(getStandardMapSizes(), opts->getWidth());
w->setSelected(position == mapSizes.size() - 1 || opts->getWidth() != opts->getHeight() ? -1 : position); w->setSelected(position == mapSizes.size() - 1 || opts->getWidth() != opts->getHeight() ? -1 : position);
} }
if(auto w = widget<CToggleButton>("buttonTwoLevels")) if(auto w = widget<CToggleButton>("buttonTwoLevels"))
@@ -485,7 +490,7 @@ void RandomMapTab::deactivateButtonsFrom(CToggleGroup & group, const std::set<in
} }
} }
std::vector<int> RandomMapTab::getPossibleMapSizes() std::vector<int> RandomMapTab::getStandardMapSizes()
{ {
return {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_MIDDLE, CMapHeader::MAP_SIZE_LARGE, CMapHeader::MAP_SIZE_XLARGE, CMapHeader::MAP_SIZE_HUGE, CMapHeader::MAP_SIZE_XHUGE, CMapHeader::MAP_SIZE_GIANT}; return {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_MIDDLE, CMapHeader::MAP_SIZE_LARGE, CMapHeader::MAP_SIZE_XLARGE, CMapHeader::MAP_SIZE_HUGE, CMapHeader::MAP_SIZE_XHUGE, CMapHeader::MAP_SIZE_GIANT};
} }

3
client/lobby/RandomMapTab.h
View File

@@ -47,7 +47,8 @@ public:
private: private:
void deactivateButtonsFrom(CToggleGroup & group, const std::set<int> & allowed); void deactivateButtonsFrom(CToggleGroup & group, const std::set<int> & allowed);
std::vector<int> getPossibleMapSizes(); std::vector<int> getStandardMapSizes();
void onToggleMapSize(int btnId);
std::shared_ptr<CMapInfo> mapInfo; std::shared_ptr<CMapInfo> mapInfo;
std::shared_ptr<CMapGenOptions> mapGenOptions; std::shared_ptr<CMapGenOptions> mapGenOptions;