commit 7d88cb38

Poul Sander · 2023-10-05 20:48
7d88cb3813700a078de44f3373b18ccd8939a9fd patch · browse files
parent b9eda2d45cc585fbad0b33ed19d1ecfd2148ee6d

Scan for all themes

Changed files

M	source/code/themes.cpp before

diff --git a/source/code/themes.cpp b/source/code/themes.cpp index 24f4f0d..37cbdd7 100644 --- a/source/code/themes.cpp +++ b/source/code/themes.cpp

@@ -29,6 +29,7 @@ https://www.blockattack.net

#include "nlohmann/json.hpp"

#include <iostream>

#include "global.hpp"

+#include <boost/algorithm/string/predicate.hpp>

using json = nlohmann::json;

@@ -138,7 +139,7 @@ static void FillMissingFields(Theme& theme) {

theme.background = background_data[theme.background.name];

}

-static void ReadThemeDataFromFile(const char* filename) {

+static void ReadThemeDataFromFile(const std::string& filename) {

if (globalData.verboseLevel) {

std::cout << "Reading theme data from " << filename << "\n";

}

@@ -196,7 +197,12 @@ void InitThemes() {

InitBackGroundData();

themes.resize(1); //Add the default theme

FillMissingFields(themes[0]);

- ReadThemeDataFromFile("themes/alt_theme.json");

+ const std::vector<std::string>& theme_files = sago::GetFileList("themes");

+ for (const std::string& filename : theme_files) {

+ if (boost::algorithm::ends_with(filename,".json")) {

+ ReadThemeDataFromFile("themes/"+filename);

+ }

DumpThemeData();

}