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

Fix pointer types

This commit is contained in:
Michał Janiszewski 2016-07-31 22:00:02 +02:00
parent ec8ac1a805
commit 2db2ef5eec
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/vehicle.c
View File

@ -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;
}
}

2
src/windows/editor_inventions_list.c
View File

@ -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)

2
src/windows/editor_object_selection.c
View File

@ -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];