games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Added 1.6 fallback + code cleanup

Browse Source
This commit is contained in:
George King
2025-03-03 17:40:11 +01:00
committed by GitHub
parent 067e4655aa
commit 5a78538ebf
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/lobby/CSelectionBase.cpp
View File

@ -92,25 +92,38 @@ CSelectionBase::CSelectionBase(ESelectionScreen type)
pos.h = 584; pos.h = 584;
if(screenType == ESelectionScreen::campaignList) if(screenType == ESelectionScreen::campaignList)
{ {
setBackground(ImagePath::builtin("CamCust.bmp")); //setBackground(ImagePath::builtin("CamCust.bmp"));
const JsonNode& gameSelectConfig = CMainMenuConfig::get().getConfig()["campaign-selection"];
const JsonVector& bgNames = gameSelectConfig["background"].Vector();
setBackground(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(bgNames, CRandomGenerator::getDefault())));
pos = background->center(); pos = background->center();
} }
else else
{ {
const JsonNode& gameSelectConfig = CMainMenuConfig::get().getConfig()["scenario-selection"];
const JsonVector& bgNames = gameSelectConfig["background"].Vector();
setBackground(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(bgNames, CRandomGenerator::getDefault()))); const JsonNode& gameSelectConfig = CMainMenuConfig::get().getConfig()["scenario-selection"];
const JsonVector* bgNames = nullptr;
if (!gameSelectConfig.isStruct())
bgNames = &CMainMenuConfig::get().getConfig()["game-select"].Vector(); // Fallback for 1.6 mods
else
bgNames = &gameSelectConfig["background"].Vector();
setBackground(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(*bgNames, CRandomGenerator::getDefault())));
pos = background->center(); pos = background->center();
// Set logo // Set logo
const auto& logoConfig = gameSelectConfig["logo"]; const auto& logoConfig = gameSelectConfig["logo"];
if (!logoConfig.isNull() && logoConfig["name"].isVector() && !logoConfig["name"].Vector().empty()) if (!logoConfig["name"].Vector().empty())
logo = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(logoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(logoConfig["x"].Integer(), logoConfig["y"].Integer())); logo = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(logoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(logoConfig["x"].Integer(), logoConfig["y"].Integer()));
// Set sublogo // Set sublogo
const auto& sublogoConfig = gameSelectConfig["sublogo"]; const auto& sublogoConfig = gameSelectConfig["sublogo"];
if (!sublogoConfig.isNull() && sublogoConfig["name"].isVector() && !sublogoConfig["name"].Vector().empty()) if (!logoConfig["name"].Vector().empty())
sublogo = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(sublogoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(sublogoConfig["x"].Integer(), sublogoConfig["y"].Integer())); sublogo = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(sublogoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(sublogoConfig["x"].Integer(), sublogoConfig["y"].Integer()));
} }