mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync "Set pay for park or rides"

This commit is contained in:
wolfreak99 2017-02-23 09:53:10 -05:00 committed by Michael Steenbeek
parent 527cce062f
commit 44c4328b36
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2/editor.c
View File

@ -628,7 +628,34 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s
gLandRightsCost = max(MONEY(5,00), min(MONEY(200,00), *edx));
break;
case EDIT_SCENARIOOPTIONS_SETPARKCHARGEMETHOD:
if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) {
if (*edx == 0) {
if (!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY)) {
gParkFlags |= PARK_FLAGS_PARK_FREE_ENTRY;
gParkEntranceFee = MONEY(0, 00);
}
}
else {
if (gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) {
gParkFlags &= ~PARK_FLAGS_PARK_FREE_ENTRY;
gParkEntranceFee = MONEY(10, 00);
}
}
}
else {
if (*edx == 0) {
if (!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY)) {
gParkFlags |= PARK_FLAGS_PARK_FREE_ENTRY;
}
}
else {
if (gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) {
gParkFlags &= ~PARK_FLAGS_PARK_FREE_ENTRY;
}
}
window_invalidate_by_class(WC_PARK_INFORMATION);
window_invalidate_by_class(WC_RIDE);
}
break;
case EDIT_SCENARIOOPTIONS_SETPARKCHARGEENTRYFEE:
gParkEntranceFee = max(MONEY(0, 00), min(MONEY(100, 00), *edx));

35
src/openrct2/windows/editor_scenario_options.c
View File

@ -1310,32 +1310,15 @@ static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rc
static void window_editor_scenario_options_park_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN && dropdownIndex != -1) {
if(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) {
if (dropdownIndex == 0) {
if (!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY)) {
gParkFlags |= PARK_FLAGS_PARK_FREE_ENTRY;
gParkEntranceFee = MONEY(0, 00);
}
} else {
if (gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) {
gParkFlags &= ~PARK_FLAGS_PARK_FREE_ENTRY;
gParkEntranceFee = MONEY(10, 00);
}
}
}
else {
if (dropdownIndex == 0) {
if (!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY)) {
gParkFlags |= PARK_FLAGS_PARK_FREE_ENTRY;
}
} else {
if (gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) {
gParkFlags &= ~PARK_FLAGS_PARK_FREE_ENTRY;
}
}
window_invalidate_by_class(WC_PARK_INFORMATION);
window_invalidate_by_class(WC_RIDE);
}
game_do_command(
0,
GAME_COMMAND_FLAG_APPLY,
EDIT_SCENARIOOPTIONS_SETPARKCHARGEMETHOD,
dropdownIndex,
GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
0,
0
);
window_invalidate(w);
}
}