From ce0147b536eb9533e3aaffa0adc9e4e0ae1fac77 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 30 Nov 2017 18:47:31 +0100 Subject: [PATCH] Fix signed/unsigned comparisons --- src/openrct2/Game.cpp | 8 ++++---- src/openrct2/Game.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index fa6d41d2b9..e80a30cb84 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -106,7 +106,7 @@ rct_string_id gErrorStringId; sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER * callback) { - for (sint32 i = 0; i < Util::CountOf(game_command_callback_table); i++) + for (uint32 i = 0; i < Util::CountOf(game_command_callback_table); i++) { if (game_command_callback_table[i] == callback) { @@ -116,7 +116,7 @@ sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER * callback) return 0; } -GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(sint32 index) +GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(uint32 index) { if (index < Util::CountOf(game_command_callback_table)) { @@ -374,7 +374,7 @@ void game_update() } // Update the game one or more times - for (sint32 i = 0; i < numUpdates; i++) + for (uint32 i = 0; i < numUpdates; i++) { game_logic_update(); @@ -569,7 +569,7 @@ sint32 game_do_command(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 es * @param flags (ebx) * @param command (esi) */ -sint32 game_do_command_p(sint32 command, sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp) +sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp) { sint32 cost, flags; sint32 original_ebx, original_edx, original_esi, original_edi, original_ebp; diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 0e055eaf3d..6bce13b49b 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -132,7 +132,7 @@ extern "C" { extern GAME_COMMAND_CALLBACK_POINTER * game_command_callback; sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER * callback); -GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(sint32 index); +GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(uint32 index); extern sint32 game_command_playerid; extern rct_string_id gGameCommandErrorTitle; @@ -169,7 +169,7 @@ void reset_all_sprite_quadrant_placements(); void update_palette_effects(); sint32 game_do_command(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); -sint32 game_do_command_p(sint32 command, sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp); +sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp); void game_log_multiplayer_command(int command, int * eax, int * ebx, int * ecx, int * edx, int * edi, int * ebp);