diff --git a/client/lobby/CSelectionBase.cpp b/client/lobby/CSelectionBase.cpp index 72254d657..f720e99f4 100644 --- a/client/lobby/CSelectionBase.cpp +++ b/client/lobby/CSelectionBase.cpp @@ -110,15 +110,11 @@ CSelectionBase::CSelectionBase(ESelectionScreen type) setBackground(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(*bgNames, CRandomGenerator::getDefault()))); pos = background->center(); - // Set logo - const auto& logoConfig = gameSelectConfig["logo"]; - if (!logoConfig["name"].Vector().empty()) - logo = std::make_shared(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(logoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(logoConfig["x"].Integer(), logoConfig["y"].Integer())); - - // Set sublogo - const auto& sublogoConfig = gameSelectConfig["sublogo"]; - if (!logoConfig["name"].Vector().empty()) - sublogo = std::make_shared(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(sublogoConfig["name"].Vector(), CRandomGenerator::getDefault())), Point(sublogoConfig["x"].Integer(), sublogoConfig["y"].Integer())); + for (const JsonNode& node : gameSelectConfig["images"].Vector()) + { + auto image = std::make_shared(ImagePath::fromJson(*RandomGeneratorUtil::nextItem(node["name"].Vector(), CRandomGenerator::getDefault())), Point(node["x"].Integer(), node["y"].Integer())); + images.push_back(image); + } } card = std::make_shared(); diff --git a/client/lobby/CSelectionBase.h b/client/lobby/CSelectionBase.h index 3e8ad57d2..bb9b0f373 100644 --- a/client/lobby/CSelectionBase.h +++ b/client/lobby/CSelectionBase.h @@ -71,8 +71,7 @@ public: std::shared_ptr buttonBack; std::shared_ptr buttonSimturns; - std::shared_ptr logo; - std::shared_ptr sublogo; + std::vector> images; std::shared_ptr tabSel; std::shared_ptr tabOpt;