games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-08 23:36:33 +02:00
Code Issues Releases Activity

Prevent crashes for custom config

Browse Source
This commit is contained in:
nordsoft 2022-12-12 03:58:39 +04:00
parent 0104c77d61
commit 3be9969154
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/gui/InterfaceBuilder.cpp
View File

@ -44,7 +44,10 @@ void InterfaceBuilder::addCallback(const std::string & callbackName, std::functi
const std::shared_ptr<CIntObject> InterfaceBuilder::widget(const std::string & name) const const std::shared_ptr<CIntObject> InterfaceBuilder::widget(const std::string & name) const
{ {
return widgets.at(name); auto iter = widgets.find(name);
if(iter == widgets.end())
return nullptr;
return iter->second;
} }
void InterfaceBuilder::init(const JsonNode &config) void InterfaceBuilder::init(const JsonNode &config)

45
client/lobby/RandomMapTab.cpp
View File

@ -53,10 +53,12 @@ RandomMapTab::RandomMapTab():
{ {
mapGenOptions->setPlayerCount(btnId); mapGenOptions->setPlayerCount(btnId);
deactivateButtonsFrom(dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams")).get(), btnId); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams")))
deactivateButtonsFrom(w.get(), btnId);
// deactive some CompOnlyPlayers buttons to prevent total number of players exceeds PlayerColor::PLAYER_LIMIT_I // deactive some CompOnlyPlayers buttons to prevent total number of players exceeds PlayerColor::PLAYER_LIMIT_I
deactivateButtonsFrom(dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers")).get(), PlayerColor::PLAYER_LIMIT_I - btnId + 1); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers")))
deactivateButtonsFrom(w.get(), PlayerColor::PLAYER_LIMIT_I - btnId + 1);
validatePlayersCnt(btnId); validatePlayersCnt(btnId);
updateMapInfoByHost(); updateMapInfoByHost();
@ -73,9 +75,11 @@ RandomMapTab::RandomMapTab():
mapGenOptions->setCompOnlyPlayerCount(btnId); mapGenOptions->setCompOnlyPlayerCount(btnId);
// deactive some MaxPlayers buttons to prevent total number of players exceeds PlayerColor::PLAYER_LIMIT_I // deactive some MaxPlayers buttons to prevent total number of players exceeds PlayerColor::PLAYER_LIMIT_I
deactivateButtonsFrom(dynamic_pointer_cast<CToggleGroup>(widget("groupMaxPlayers")).get(), PlayerColor::PLAYER_LIMIT_I - btnId + 1); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMaxPlayers")))
deactivateButtonsFrom(w.get(), PlayerColor::PLAYER_LIMIT_I - btnId + 1);
deactivateButtonsFrom(dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams")).get(), (btnId == 0 ? 1 : btnId)); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams")))
deactivateButtonsFrom(w.get(), (btnId == 0 ? 1 : btnId));
validateCompOnlyPlayersCnt(btnId); validateCompOnlyPlayersCnt(btnId);
updateMapInfoByHost(); updateMapInfoByHost();
}); });
@ -161,14 +165,22 @@ void RandomMapTab::updateMapInfoByHost()
void RandomMapTab::setMapGenOptions(std::shared_ptr<CMapGenOptions> opts) void RandomMapTab::setMapGenOptions(std::shared_ptr<CMapGenOptions> opts)
{ {
dynamic_pointer_cast<CToggleGroup>(widget("groupMapSize"))->setSelected(vstd::find_pos(getPossibleMapSizes(), opts->getWidth())); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMapSize")))
dynamic_pointer_cast<CToggleButton>(widget("buttonTwoLevels"))->setSelected(opts->getHasTwoLevels()); w->setSelected(vstd::find_pos(getPossibleMapSizes(), opts->getWidth()));
dynamic_pointer_cast<CToggleGroup>(widget("groupMaxPlayers"))->setSelected(opts->getPlayerCount()); if(auto w = dynamic_pointer_cast<CToggleButton>(widget("buttonTwoLevels")))
dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams"))->setSelected(opts->getTeamCount()); w->setSelected(opts->getHasTwoLevels());
dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers"))->setSelected(opts->getCompOnlyPlayerCount()); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMaxPlayers")))
dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams"))->setSelected(opts->getCompOnlyTeamCount()); w->setSelected(opts->getPlayerCount());
dynamic_pointer_cast<CToggleGroup>(widget("groupWaterContent"))->setSelected(opts->getWaterContent()); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams")))
dynamic_pointer_cast<CToggleGroup>(widget("groupMonsterStrength"))->setSelected(opts->getMonsterStrength()); w->setSelected(opts->getTeamCount());
if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers")))
w->setSelected(opts->getCompOnlyPlayerCount());
if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams")))
w->setSelected(opts->getCompOnlyTeamCount());
if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupWaterContent")))
w->setSelected(opts->getWaterContent());
if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupgroupMonsterStrengthMaxTeams")))
w->setSelected(opts->getMonsterStrength());
} }
void RandomMapTab::deactivateButtonsFrom(CToggleGroup * group, int startId) void RandomMapTab::deactivateButtonsFrom(CToggleGroup * group, int startId)
@ -200,13 +212,15 @@ void RandomMapTab::validatePlayersCnt(int playersCnt)
if(mapGenOptions->getTeamCount() >= playersCnt) if(mapGenOptions->getTeamCount() >= playersCnt)
{ {
mapGenOptions->setTeamCount(playersCnt - 1); mapGenOptions->setTeamCount(playersCnt - 1);
dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams"))->setSelected(mapGenOptions->getTeamCount()); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupMaxTeams")))
w->setSelected(mapGenOptions->getTeamCount());
} }
// total players should not exceed PlayerColor::PLAYER_LIMIT_I (8 in homm3) // total players should not exceed PlayerColor::PLAYER_LIMIT_I (8 in homm3)
if(mapGenOptions->getCompOnlyPlayerCount() + playersCnt > PlayerColor::PLAYER_LIMIT_I) if(mapGenOptions->getCompOnlyPlayerCount() + playersCnt > PlayerColor::PLAYER_LIMIT_I)
{ {
mapGenOptions->setCompOnlyPlayerCount(PlayerColor::PLAYER_LIMIT_I - playersCnt); mapGenOptions->setCompOnlyPlayerCount(PlayerColor::PLAYER_LIMIT_I - playersCnt);
dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers"))->setSelected(mapGenOptions->getCompOnlyPlayerCount()); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyPlayers")))
w->setSelected(mapGenOptions->getCompOnlyPlayerCount());
} }
validateCompOnlyPlayersCnt(mapGenOptions->getCompOnlyPlayerCount()); validateCompOnlyPlayersCnt(mapGenOptions->getCompOnlyPlayerCount());
@ -224,7 +238,8 @@ void RandomMapTab::validateCompOnlyPlayersCnt(int compOnlyPlayersCnt)
int compOnlyTeamCount = compOnlyPlayersCnt == 0 ? 0 : compOnlyPlayersCnt - 1; int compOnlyTeamCount = compOnlyPlayersCnt == 0 ? 0 : compOnlyPlayersCnt - 1;
mapGenOptions->setCompOnlyTeamCount(compOnlyTeamCount); mapGenOptions->setCompOnlyTeamCount(compOnlyTeamCount);
updateMapInfoByHost(); updateMapInfoByHost();
dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams"))->setSelected(compOnlyTeamCount); if(auto w = dynamic_pointer_cast<CToggleGroup>(widget("groupCompOnlyTeams")))
w->setSelected(compOnlyTeamCount);
} }
} }