mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename WINDOW_LIMIT_MAX to kWindowLimitMax
This commit is contained in:
parent
343b10c172
commit
9e2b45fab3
|
@ -217,7 +217,7 @@ namespace Config
|
||||||
model->LastSaveScenarioDirectory = reader->GetString("last_scenario_directory", "");
|
model->LastSaveScenarioDirectory = reader->GetString("last_scenario_directory", "");
|
||||||
model->LastSaveTrackDirectory = reader->GetString("last_track_directory", "");
|
model->LastSaveTrackDirectory = reader->GetString("last_track_directory", "");
|
||||||
model->UseNativeBrowseDialog = reader->GetBoolean("use_native_browse_dialog", false);
|
model->UseNativeBrowseDialog = reader->GetBoolean("use_native_browse_dialog", false);
|
||||||
model->WindowLimit = reader->GetInt32("window_limit", WINDOW_LIMIT_MAX);
|
model->WindowLimit = reader->GetInt32("window_limit", kWindowLimitMax);
|
||||||
model->ZoomToCursor = reader->GetBoolean("zoom_to_cursor", true);
|
model->ZoomToCursor = reader->GetBoolean("zoom_to_cursor", true);
|
||||||
model->RenderWeatherEffects = reader->GetBoolean("render_weather_effects", true);
|
model->RenderWeatherEffects = reader->GetBoolean("render_weather_effects", true);
|
||||||
model->RenderWeatherGloom = reader->GetBoolean("render_weather_gloom", true);
|
model->RenderWeatherGloom = reader->GetBoolean("render_weather_gloom", true);
|
||||||
|
|
|
@ -114,7 +114,7 @@ struct InteractionInfo
|
||||||
ViewportInteractionItem SpriteType = ViewportInteractionItem::None;
|
ViewportInteractionItem SpriteType = ViewportInteractionItem::None;
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr int32_t kMaxViewportCount = WINDOW_LIMIT_MAX;
|
constexpr int32_t kMaxViewportCount = kWindowLimitMax;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A reference counter for whether something is forcing the grid lines to show. When the counter
|
* A reference counter for whether something is forcing the grid lines to show. When the counter
|
||||||
|
|
|
@ -194,7 +194,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification)
|
||||||
void WindowSetWindowLimit(int32_t value)
|
void WindowSetWindowLimit(int32_t value)
|
||||||
{
|
{
|
||||||
int32_t prev = gConfigGeneral.WindowLimit;
|
int32_t prev = gConfigGeneral.WindowLimit;
|
||||||
int32_t val = std::clamp<int32_t>(value, kWindowLimitMin, WINDOW_LIMIT_MAX);
|
int32_t val = std::clamp<int32_t>(value, kWindowLimitMin, kWindowLimitMax);
|
||||||
gConfigGeneral.WindowLimit = val;
|
gConfigGeneral.WindowLimit = val;
|
||||||
ConfigSaveDefault();
|
ConfigSaveDefault();
|
||||||
// Checks if value decreases and then closes surplus
|
// Checks if value decreases and then closes surplus
|
||||||
|
|
|
@ -483,7 +483,7 @@ using modal_callback = void (*)(int32_t result);
|
||||||
using close_callback = void (*)();
|
using close_callback = void (*)();
|
||||||
|
|
||||||
constexpr int8_t kWindowLimitMin = 4;
|
constexpr int8_t kWindowLimitMin = 4;
|
||||||
#define WINDOW_LIMIT_MAX 64
|
constexpr int8_t kWindowLimitMax = 64;
|
||||||
#define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc.
|
#define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc.
|
||||||
|
|
||||||
extern WindowBase* gWindowAudioExclusive;
|
extern WindowBase* gWindowAudioExclusive;
|
||||||
|
|
Loading…
Reference in New Issue