From fcafd9576abf2ecc2a54ab78b0bfb35479079544 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Fri, 24 Feb 2017 01:57:36 -0500 Subject: [PATCH] Replace FALSE/TRUE with 0/1 --- src/openrct2/editor.c | 20 +++++++++---------- .../windows/editor_scenario_options.c | 18 ++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index 41782aba3e..288b86ac44 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -542,7 +542,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s switch (*ecx) { case EDIT_SCENARIOOPTIONS_SETNOMONEY: if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) { - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_NO_MONEY_SCENARIO; } else { @@ -550,7 +550,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } } else { - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_NO_MONEY; } else { @@ -586,7 +586,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s window_invalidate_by_class(WC_FINANCES); break; case EDIT_SCENARIOOPTIONS_SETFORBIDMARKETINGCAMPAIGNS: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_FORBID_MARKETING_CAMPAIGN; } else { @@ -606,7 +606,7 @@ 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) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_PREF_LESS_INTENSE_RIDES; } else { @@ -614,7 +614,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_PREF_MORE_INTENSE_RIDES; } else { @@ -662,7 +662,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s window_invalidate_by_class(WC_PARK_INFORMATION); break; case EDIT_SCENARIOOPTIONS_SETFORBIDTREEREMOVAL: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_FORBID_TREE_REMOVAL; } else { @@ -670,7 +670,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETFORBIDLANDSCAPECHANGES: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_FORBID_LANDSCAPE_CHANGES; } else { @@ -678,7 +678,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETFORBIDHIGHCONSTRUCTION: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; } else { @@ -686,7 +686,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETPARKRATINGHIGHERDIFFICULTLEVEL: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_DIFFICULT_PARK_RATING; } else { @@ -694,7 +694,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETGUESTGENERATIONHIGHERDIFFICULTLEVEL: - if (*edx != FALSE) { + if (*edx != 0) { gParkFlags |= PARK_FLAGS_DIFFICULT_GUEST_GENERATION; } else { diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index 988c8d534f..164b41d6c8 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -504,7 +504,7 @@ static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETNOMONEY, - gParkFlags & PARK_FLAGS_NO_MONEY ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_NO_MONEY ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -516,7 +516,7 @@ static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDMARKETINGCAMPAIGNS, - gParkFlags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -839,7 +839,7 @@ static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTSPREFERLESSINTENSERIDES, - gParkFlags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -851,7 +851,7 @@ static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES, - gParkFlags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -1147,7 +1147,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 wi 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDTREEREMOVAL, - gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -1159,7 +1159,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 wi 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDLANDSCAPECHANGES, - gParkFlags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -1171,7 +1171,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 wi 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDHIGHCONSTRUCTION, - gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -1183,7 +1183,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 wi 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETPARKRATINGHIGHERDIFFICULTLEVEL, - gParkFlags & PARK_FLAGS_DIFFICULT_PARK_RATING ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_DIFFICULT_PARK_RATING ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0 @@ -1195,7 +1195,7 @@ static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 wi 0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTGENERATIONHIGHERDIFFICULTLEVEL, - gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? FALSE : TRUE, + gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0