mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Label PARK_FLAGS_18 and adjust SCENARIO_NO_MONEY comment

Browse Source
This commit is contained in:
duncanspumpkin
2017-01-29 20:08:37 +00:00
parent 2381bd5cfb
commit e749285e48
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/editor.c
View File

@@ -333,7 +333,7 @@ static void editor_clear_map_for_editing(bool fromSave)
else
gParkFlags &= ~PARK_FLAGS_PARK_FREE_ENTRY;
gParkFlags &= ~PARK_FLAGS_18;
gParkFlags &= ~PARK_FLAGS_SPRITES_INITIALISED;
gGuestInitialCash = clamp(MONEY(10,00), gGuestInitialCash, MONEY(100,00));

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1877,7 +1877,7 @@ private:
{
gCheatsUnlockAllPrices = true;
}
// RCT2 uses two flags for no money (for cheat detection). RCT1 used only one.
// RCT2 uses two flags for no money (due to the scenario editor). RCT1 used only one.
// Copy its value to make no money scenarios such as Arid Heights work properly.
if (_s4.park_flags & RCT1_PARK_FLAGS_NO_MONEY)
{

2
src/openrct2/scenario/scenario.c
View File

@@ -264,7 +264,7 @@ void scenario_begin()
gParkEntranceFee = 0;
}
gParkFlags |= PARK_FLAGS_18;
gParkFlags |= PARK_FLAGS_SPRITES_INITIALISED;
load_palette();
gfx_invalidate_screen();

6
src/openrct2/windows/editor_bottom_toolbar.c
View File

@@ -354,7 +354,7 @@ static void window_editor_bottom_toolbar_mouseup(rct_window *w, sint32 widgetInd
{
if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON) {
if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) ||
(gSpriteListCount[SPRITE_LIST_NULL] == MAX_SPRITES && !(gParkFlags & PARK_FLAGS_18))
(gSpriteListCount[SPRITE_LIST_NULL] == MAX_SPRITES && !(gParkFlags & PARK_FLAGS_SPRITES_INITIALISED))
) {
previous_button_mouseup_events[gS6Info.editor_step]();
}
@@ -401,7 +401,7 @@ void window_editor_bottom_toolbar_invalidate(rct_window *w)
} else if (gS6Info.editor_step == EDITOR_STEP_ROLLERCOASTER_DESIGNER) {
hide_next_step_button();
} else if (!(gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER)) {
if (gSpriteListCount[SPRITE_LIST_NULL] != MAX_SPRITES || gParkFlags & PARK_FLAGS_18) {
if (gSpriteListCount[SPRITE_LIST_NULL] != MAX_SPRITES || gParkFlags & PARK_FLAGS_SPRITES_INITIALISED) {
hide_previous_step_button();
}
}
@@ -426,7 +426,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
else if (gSpriteListCount[SPRITE_LIST_NULL] != MAX_SPRITES) {
drawNextButton = true;
}
else if (gParkFlags & PARK_FLAGS_18) {
else if (gParkFlags & PARK_FLAGS_SPRITES_INITIALISED) {
drawNextButton = true;
}
else {

2
src/openrct2/windows/loadsave.c
View File

@@ -785,7 +785,7 @@ static void window_loadsave_select(rct_window *w, const char *path)
{
save_path(&gConfigGeneral.last_save_scenario_directory, path);
sint32 parkFlagsBackup = gParkFlags;
gParkFlags &= ~PARK_FLAGS_18;
gParkFlags &= ~PARK_FLAGS_SPRITES_INITIALISED;
gS6Info.editor_step = 255;
rw = SDL_RWFromFile(path, "wb+");
sint32 success = 0;

2
src/openrct2/world/park.h
View File

@@ -42,7 +42,7 @@ enum {
PARK_FLAGS_DIFFICULT_PARK_RATING = (1 << 14),
PARK_FLAGS_LOCK_REAL_NAMES_OPTION = (1 << 15),
PARK_FLAGS_NO_MONEY_SCENARIO = (1 << 17), // equivalent to PARK_FLAGS_NO_MONEY, but used in scenario editor
PARK_FLAGS_18 = (1 << 18),
PARK_FLAGS_SPRITES_INITIALISED = (1 << 18), // After a scenario is loaded this prevents edits in the scenario editor
PARK_FLAGS_SIX_FLAGS_DEPRECATED = (1 << 19) // Not used anymore
};