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

Fix pointer types for 64 bit builds

Browse Source
This commit is contained in:
Michał Janiszewski
2016-07-30 14:13:04 +02:00
parent ddb72b6f22
commit b16b6814aa
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scenario.c
View File

@@ -218,7 +218,7 @@ void scenario_begin()
}
} else {
rct_stex_entry* stex = g_stexEntries[0];
if ((int)stex != -1) {
if ((intptr_t)stex != -1) {
char *buffer = (char*)RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER;
// Set localised park name
@@ -453,7 +453,7 @@ static void scenario_week_update()
rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0];
if (month <= MONTH_APRIL && (sint32)water_type != -1 && water_type->var_0E & 1) {
if (month <= MONTH_APRIL && (intptr_t)water_type != -1 && water_type->var_0E & 1) {
// 100 attempts at finding some water to create a few ducks at
for (int i = 0; i < 100; i++) {
if (scenario_create_ducks())
@@ -666,7 +666,7 @@ int scenario_prepare_for_save()
s6Info->entry.flags = 255;
rct_stex_entry* stex = g_stexEntries[0];
if ((int)stex != 0xFFFFFFFF) {
if ((intptr_t)stex != -1) {
format_string(buffer, stex->scenario_name, NULL);
safe_strcpy(s6Info->name, buffer, sizeof(s6Info->name));