mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1012 from Garogolun/mingw-fixes

Browse Source 
Couple of small fixes
This commit is contained in:
Ted John
2015-04-12 23:00:35 +01:00
parent b1b06a80be 72de53391c
commit f4ffdbde63
20 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ride/track.c
View File

@@ -448,10 +448,10 @@ void track_load_list(ride_list_item item)
//RCT2_CALLPROC_X(0x006CED50, 0, 0, 0, *((uint16*)&item), 0, 0, 0);
}
static void read(void *dst, void **src, int length)
static void read(void *dst, char **src, int length)
{
memcpy(dst, *src, length);
*((char**)src) += length;
*src += length;
}
/**
@@ -553,13 +553,13 @@ rct_track_td6* load_track_design(const char *path)
// Edit the colours to use the new versions
// Unsure why it is 67
edi = (uint8*)&track_design->vehicle_colours;
for (i = 0; i < 67; i++)
*edi++ = RCT2_ADDRESS(0x0097F0BC, uint8)[*edi];
for (i = 0; i < 67; i++, edi++)
*edi = RCT2_ADDRESS(0x0097F0BC, uint8)[*edi];
// Edit the colours to use the new versions
edi = (uint8*)&track_design->track_spine_colour;
for (i = 0; i < 12; i++)
*edi++ = RCT2_ADDRESS(0x0097F0BC, uint8)[*edi];
for (i = 0; i < 12; i++, edi++)
*edi = RCT2_ADDRESS(0x0097F0BC, uint8)[*edi];
// Highest drop height is 1bit = 3/4 a meter in td6
// Highest drop height is 1bit = 1/3 a meter in td4

4
src/ride/vehicle.c
View File

@@ -229,7 +229,7 @@ void vehicle_sounds_update()
vehicle_sound->id = (uint16)-1;
}
label26:
1;
;
}
//for (rct_vehicle_sound_params* vehicle_sound_params = &RCT2_GLOBAL(0x00F438B4, rct_vehicle_sound_params); ; vehicle_sound_params++) {
@@ -534,7 +534,7 @@ void vehicle_sounds_update()
}
}
label114:
1;
;
}
}
}