From 8b3f0a4df8d4d060c663a6fff1bd8a2fda9cda83 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Thu, 23 Feb 2017 09:38:16 -0500 Subject: [PATCH] Sync "Set guests prefer less/more intense rides" --- src/openrct2/editor.c | 14 +++++++++++-- .../windows/editor_scenario_options.c | 20 +++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index fad72dbf26..abb3c25093 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -606,10 +606,20 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s gGuestInitialThirst = max(40, min(250, *edx)); break; case EDIT_SCENARIOOPTIONS_SETGUESTSPREFERLESSINTENSERIDES: - + if (*edx != FALSE) { + gParkFlags |= PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + } + else { + gParkFlags &= ~PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + } break; case EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES: - + if (*edx != FALSE) { + gParkFlags |= PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + } + else { + gParkFlags &= ~PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + } break; case EDIT_SCENARIOOPTIONS_SETCOSTTOBUYLAND: diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index eb23794401..5ce2c8a62b 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -835,11 +835,27 @@ static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 window_editor_scenario_options_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_GUEST_PREFER_LESS_INTENSE_RIDES: - gParkFlags ^= PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETGUESTSPREFERLESSINTENSERIDES, + gParkFlags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES ? FALSE : TRUE, + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); window_invalidate(w); break; case WIDX_GUEST_PREFER_MORE_INTENSE_RIDES: - gParkFlags ^= PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES, + gParkFlags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES ? FALSE : TRUE, + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); window_invalidate(w); break; }