From 12800b8d74c01c5ccf229eb51f6ce9751232bc9e Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Thu, 14 Aug 2014 23:08:46 +0100 Subject: [PATCH] Removed warnings. Only reads 4 characters for string id --- src/object.c | 8 ++++---- src/string_ids.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/object.c b/src/object.c index a614660d05..1df31a9b79 100644 --- a/src/object.c +++ b/src/object.c @@ -100,16 +100,16 @@ static int object_calculate_checksum(rct_object_entry *entry, char *data, int da * chunk : esi */ int object_scenario_load_custom_text(char* chunk){ - int ebp = &((uint32*)chunk)[2]; + int ebp = (int)(&((uint32*)chunk)[2]); int edx = 0; int eax, ebx, ecx, edi; - RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, &chunk, &edi, &ebp); + RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, (int*)&chunk, &edi, &ebp); *((uint16*)chunk) = eax; edx++; - RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, &chunk, &edi, &ebp); + RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, (int*)&chunk, &edi, &ebp); *((uint16*)chunk + 1) = eax; edx++; - RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, &chunk, &edi, &ebp); + RCT2_CALLFUNC_X(0x6A9E24, &eax, &ebx, &ecx, &edx, (int*)&chunk, &edi, &ebp); *((uint16*)chunk + 2) = eax; if (RCT2_GLOBAL(0x9ADAF4, int) == -1)return 0; diff --git a/src/string_ids.c b/src/string_ids.c index 40da3f789c..eb142f1204 100644 --- a/src/string_ids.c +++ b/src/string_ids.c @@ -1759,8 +1759,8 @@ int language_open(const char *filename) mode = 1; } else if (!strncmp(src, "STR_", 4)){ - // Copy in the string number - if (sscanf(src, "STR_%d", &string_no) != 1){ + // Copy in the string number, 4 characters only + if (sscanf(src, "STR_%4d", &string_no) != 1){ string_no = -1; } }