From 2db2ef5eec8f4b5745eb87dd3b2a302471c92af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 31 Jul 2016 22:00:02 +0200 Subject: [PATCH] Fix pointer types --- src/ride/vehicle.c | 2 +- src/windows/editor_inventions_list.c | 2 +- src/windows/editor_object_selection.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 0621deff3a..2dc0e2d392 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -702,7 +702,7 @@ void vehicle_sounds_update() vehicle_sound++; i++; if (i >= countof(gVehicleSoundList)) { - vehicle_sound_params = (rct_vehicle_sound_params*)((int)vehicle_sound_params + 10); + vehicle_sound_params = (rct_vehicle_sound_params*)((uintptr_t)vehicle_sound_params + 10); goto label28; } } diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index 542cc9cfa5..66119e0de9 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -211,7 +211,7 @@ static void research_rides_setup(){ for (uint8 rideType = 0; rideType < object_entry_group_counts[OBJECT_TYPE_RIDE]; rideType++){ rct_ride_entry* master_ride = get_ride_entry(rideType); - if (master_ride == NULL || (uint32)master_ride == 0xFFFFFFFF) + if (master_ride == NULL || (intptr_t)master_ride == -1) continue; if (master_ride->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE) diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 80e8954c88..6fa508b452 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -1694,7 +1694,7 @@ static void window_editor_object_selection_manage_tracks() gS6Info->editor_step = EDITOR_STEP_TRACK_DESIGNS_MANAGER; int entry_index = 0; - for (; ((int)object_entry_groups[0].chunks[entry_index]) == -1; ++entry_index); + for (; ((intptr_t)object_entry_groups[0].chunks[entry_index]) == -1; ++entry_index); rct_ride_entry* ride_entry = get_ride_entry(entry_index); uint8* ride_type_array = &ride_entry->ride_type[0];