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

Merge pull request #741 from duncanspumpkin/display_missing_objects

Browse Source 
Display all missing objects before failing
This commit is contained in:
Ted John
2015-02-03 20:28:50 +00:00
parent ad60311943 e182d19358
commit 9771ddec83
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/object_list.c
View File

@@ -392,6 +392,7 @@ int object_read_and_load_entries(FILE *file)
entries = malloc(OBJECT_ENTRY_COUNT * sizeof(rct_object_entry));
sawyercoding_read_chunk(file, (uint8*)entries);
uint8 load_fail = 0;
// Load each object
for (i = 0; i < OBJECT_ENTRY_COUNT; i++) {
if (!check_object_entry(&entries[i]))
@@ -409,14 +410,16 @@ int object_read_and_load_entries(FILE *file)
if (!object_load(entryGroupIndex, &entries[i], NULL)) {
log_error("failed to load entry: %.8s", entries[i].name);
memcpy((char*)0x13CE952, &entries[i], sizeof(rct_object_entry));
free(entries);
object_unload_all();
RCT2_GLOBAL(0x14241BC, uint32) = 0;
return 0;
load_fail = 1;
}
}
free(entries);
free(entries);
if (load_fail){
object_unload_all();
RCT2_GLOBAL(0x14241BC, uint32) = 0;
return 0;
}
return 1;
}