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

Code cleanup

Browse Source
This commit is contained in:
George King
2025-03-07 14:11:43 +01:00
committed by GitHub
parent dcea840626
commit ac57e1ee7f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mainmenu/CMainMenu.cpp
View File

@@ -77,7 +77,7 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
const auto& bgConfig = config["background"]; const auto& bgConfig = config["background"];
if (bgConfig.isVector() && !bgConfig.Vector().empty()) if (bgConfig.isVector())
background = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(bgConfig.Vector(), CRandomGenerator::getDefault()))); background = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(bgConfig.Vector(), CRandomGenerator::getDefault())));
if (bgConfig.isString()) if (bgConfig.isString())
@@ -89,13 +89,13 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
pos = background->center(); pos = background->center();
const auto& logoConfig = config["logo"]; const auto& logoConfig = config["logo"];
if (!logoConfig.isNull() && logoConfig["name"].isVector() && !logoConfig["name"].Vector().empty()) { if (!logoConfig["name"].Vector().empty()) {
auto logoImage = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(logoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(logoConfig["x"].Integer(), logoConfig["y"].Integer())); auto logoImage = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(logoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(logoConfig["x"].Integer(), logoConfig["y"].Integer()));
images.push_back(logoImage); images.push_back(logoImage);
} }
const auto& sublogoConfig = config["sublogo"]; const auto& sublogoConfig = config["sublogo"];
if (!sublogoConfig.isNull() && sublogoConfig["name"].isVector() && !sublogoConfig["name"].Vector().empty()) { if (!sublogoConfig["name"].Vector().empty()) {
auto logoImage = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(sublogoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(sublogoConfig["x"].Integer(), sublogoConfig["y"].Integer())); auto logoImage = std::make_shared<CPicture>(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(sublogoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(sublogoConfig["x"].Integer(), sublogoConfig["y"].Integer()));
images.push_back(logoImage); images.push_back(logoImage);
} }