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

"general" -> "interface"

Browse Source
This commit is contained in:
Laserlicht
2024-10-01 16:09:22 +02:00
committed by GitHub
parent 844b078482
commit be31041a48
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/render/AssetGenerator.cpp
View File

@@ -143,7 +143,7 @@ void AssetGenerator::createPlayerColoredBackground(const PlayerColor & player)
std::shared_ptr<IImage> texture = GH.renderHandler().loadImage(locator, EImageBlitMode::OPAQUE); 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 // 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 = { static const std::array<ColorFilter, PlayerColor::PLAYER_LIMIT_I> filters = {
ColorFilter::genRangeShifter( filterSettings["red" ].convertTo<std::vector<float>>() ), ColorFilter::genRangeShifter( filterSettings["red" ].convertTo<std::vector<float>>() ),
ColorFilter::genRangeShifter( filterSettings["blue" ].convertTo<std::vector<float>>() ), ColorFilter::genRangeShifter( filterSettings["blue" ].convertTo<std::vector<float>>() ),

2
config/gameConfig.json
View File

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

2
config/schemas/gameSettings.json
View File

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

2
lib/GameSettings.cpp
View File

@@ -101,7 +101,7 @@ const std::vector<GameSettings::SettingOption> GameSettings::settingProperties =
{EGameSettings::TEXTS_TERRAIN, "textData", "terrain" }, {EGameSettings::TEXTS_TERRAIN, "textData", "terrain" },
{EGameSettings::TOWNS_BUILDINGS_PER_TURN_CAP, "towns", "buildingsPerTurnCap" }, {EGameSettings::TOWNS_BUILDINGS_PER_TURN_CAP, "towns", "buildingsPerTurnCap" },
{EGameSettings::TOWNS_STARTING_DWELLING_CHANCES, "towns", "startingDwellingChances" }, {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) void GameSettings::loadBase(const JsonNode & input)

2
lib/IGameSettings.h
View File

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