瀏覽代碼

"general" -> "interface"

Laserlicht 1 年之前
父節點
當前提交
be31041a48
共有 5 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      client/render/AssetGenerator.cpp
  2. 1 1
      config/gameConfig.json
  3. 1 1
      config/schemas/gameSettings.json
  4. 1 1
      lib/GameSettings.cpp
  5. 1 1
      lib/IGameSettings.h

+ 1 - 1
client/render/AssetGenerator.cpp

@@ -143,7 +143,7 @@ void AssetGenerator::createPlayerColoredBackground(const PlayerColor & player)
 	std::shared_ptr<IImage> texture = GH.renderHandler().loadImage(locator, EImageBlitMode::OPAQUE);
 
 	// transform to make color of brown DIBOX.PCX texture match color of specified player
-	auto filterSettings = VLC->settingsHandler->getFullConfig()["general"]["playerColoredBackground"];
+	auto filterSettings = VLC->settingsHandler->getFullConfig()["interface"]["playerColoredBackground"];
 	static const std::array<ColorFilter, PlayerColor::PLAYER_LIMIT_I> filters = {
 		ColorFilter::genRangeShifter( filterSettings["red"   ].convertTo<std::vector<float>>() ),
 		ColorFilter::genRangeShifter( filterSettings["blue"  ].convertTo<std::vector<float>>() ),

+ 1 - 1
config/gameConfig.json

@@ -557,7 +557,7 @@
 			}
 		},
 
-		"general" :
+		"interface" :
 		{
 			// Color transform to make color of brown DIBOX.PCX texture match color of specified player
 			"playerColoredBackground" :

+ 1 - 1
config/schemas/gameSettings.json

@@ -148,7 +148,7 @@
 				"perHero" : { "type" : "object" }
 			}
 		},
-		"general": {
+		"interface": {
 			"type" : "object",
 			"additionalProperties" : false,
 			"properties" : {

+ 1 - 1
lib/GameSettings.cpp

@@ -101,7 +101,7 @@ const std::vector<GameSettings::SettingOption> GameSettings::settingProperties =
 		{EGameSettings::TEXTS_TERRAIN,                          "textData",  "terrain"                          },
 		{EGameSettings::TOWNS_BUILDINGS_PER_TURN_CAP,           "towns",     "buildingsPerTurnCap"              },
 		{EGameSettings::TOWNS_STARTING_DWELLING_CHANCES,        "towns",     "startingDwellingChances"          },
-		{EGameSettings::GENERAL_PLAYER_COLORED_BACKGROUND,      "general",   "playerColoredBackground"          },
+		{EGameSettings::INTERFACE_PLAYER_COLORED_BACKGROUND,    "interface", "playerColoredBackground"          },
 	};
 
 void GameSettings::loadBase(const JsonNode & input)

+ 1 - 1
lib/IGameSettings.h

@@ -79,7 +79,7 @@ enum class EGameSettings
 	TEXTS_TERRAIN,
 	TOWNS_BUILDINGS_PER_TURN_CAP,
 	TOWNS_STARTING_DWELLING_CHANCES,
-	GENERAL_PLAYER_COLORED_BACKGROUND,
+	INTERFACE_PLAYER_COLORED_BACKGROUND,
 
 	OPTIONS_COUNT,
 	OPTIONS_BEGIN = BONUSES_GLOBAL