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

Removed warnings. Only reads 4 characters for string id

Browse Source
This commit is contained in:
Duncan Frost
2014-08-14 23:08:46 +01:00
parent 0251cf7679
commit 12800b8d74
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/object.c
View File

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

4
src/string_ids.c
View File

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