mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Found cause of crash. Game will enter hybrid state when failed to load.

Browse Source
This commit is contained in:
Duncan Frost
2014-11-19 21:46:32 +00:00
parent 90c866a936
commit 4459d127d0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game.c
View File

@@ -648,12 +648,7 @@ int game_load_save(const char *path)
}
}
if (!object_read_and_load_entries(file)){
fclose(file);
RCT2_GLOBAL(0x009AC31B, uint8) = 255;
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, uint16) = STR_FILE_CONTAINS_INVALID_DATA;
return 0;
};
uint8 load_success = object_read_and_load_entries(file);
// Read flags (16 bytes)
sawyercoding_read_chunk(file, (uint8*)RCT2_ADDRESS_CURRENT_MONTH_YEAR);
@@ -670,6 +665,12 @@ int game_load_save(const char *path)
// Check expansion pack
// RCT2_CALLPROC_EBPSAFE(0x006757E6);
if (!load_success){
RCT2_CALLPROC_X(0x675827, 0, 0, 0, 0, 0, 0, 0);
RCT2_CALLPROC_X(0x66DC83, 0, 0, 0, 0, 0, 0, 0);
return;
}
// The rest is the same as in scenario load and play
RCT2_CALLPROC_EBPSAFE(0x006A9FC0);
map_update_tile_pointers();

2
src/object_list.c
View File

@@ -202,7 +202,7 @@ int object_read_and_load_entries(FILE *file)
// Failed to load the object
//Destroy progress bar
memcpy((char*)0x13CE952, entries[i].name, 8);
memcpy((char*)0x13CE952, &entries[i], sizeof(rct_object_entry));
free(entries);
object_unload_all();
RCT2_GLOBAL(0x14241BC, uint32) = 0;