Skip to content

Commit

Permalink
Fix Settings Localization IDs (scp-fs2open#6242)
Browse files Browse the repository at this point in the history
In `strings.tbl` the graphics settings localization IDs are as follows:
1160, "Low"
1161, "Medium"
1162, "High"
1163, "Very High"

These values are used throughout the code, but in some cases with SCPUI upgrades, the IDs got off by 1. This PR fixes those incorrect IDs.
  • Loading branch information
wookieejedi authored Jul 9, 2024
1 parent 5235aac commit 52f4175
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions code/globalincs/systemvars.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ detail_levels Detail_defaults[NUM_DEFAULT_DETAIL_LEVELS] = {
detail_levels Detail = Detail_defaults[NUM_DEFAULT_DETAIL_LEVELS - 1];

const SCP_vector<std::pair<int, std::pair<const char*, int>>> DetailLevelValues = {{ 0, {"Minimum", 1680}},
{ 1, {"Low", 1161}},
{ 2, {"Medium", 1162}},
{ 3, {"High", 1163}},
{ 1, {"Low", 1160}},
{ 2, {"Medium", 1161}},
{ 3, {"High", 1162}},
{ 4, {"Ultra", 1721}}};

const auto ModelDetailOption __UNUSED = options::OptionBuilder<int>("Graphics.Detail",
Expand Down
6 changes: 3 additions & 3 deletions code/graphics/2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ static auto GammaOption __UNUSED = options::OptionBuilder<float>("Graphics.Gamma


const SCP_vector<std::pair<int, std::pair<const char*, int>>> DetailLevelValues = {{ 0, {"Minimum", 1680}},
{ 1, {"Low", 1161}},
{ 2, {"Medium", 1162}},
{ 3, {"High", 1163}},
{ 1, {"Low", 1160}},
{ 2, {"Medium", 1161}},
{ 3, {"High", 1162}},
{ 4, {"Ultra", 1721}}};

const auto LightingOption __UNUSED = options::OptionBuilder<int>("Graphics.Lighting",
Expand Down
6 changes: 3 additions & 3 deletions code/nebula/neb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ SCP_vector<poof> Neb2_poofs;
int Neb2_background_color[3] = {0, 0, 255}; // rgb background color (used for lame rendering)

const SCP_vector<std::pair<int, std::pair<const char*, int>>> DetailLevelValues = {{ 0, {"Minimum", 1680}},
{ 1, {"Low", 1161}},
{ 2, {"Medium", 1162}},
{ 3, {"High", 1163}},
{ 1, {"Low", 1160}},
{ 2, {"Medium", 1161}},
{ 3, {"High", 1162}},
{ 4, {"Ultra", 1721}}};

const auto NebulaDetailOption __UNUSED = options::OptionBuilder<int>("Graphics.NebulaDetail",
Expand Down

0 comments on commit 52f4175

Please sign in to comment.