mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #3934: Crash upon loading scenario

This commit is contained in:
Ted John 2016-09-29 17:52:16 +01:00
parent 63cec64a4a
commit b3b2f1d1a7
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object.h
View File

@ -112,7 +112,7 @@ bool object_load_entries(rct_object_entry* entries);
int object_load_packed(SDL_RWops* rw);
bool object_saved_packed(SDL_RWops* rw, const rct_object_entry * entry);
int check_object_entry(const rct_object_entry *entry);
bool object_entry_is_empty(const rct_object_entry *entry);
bool object_entry_compare(const rct_object_entry *a, const rct_object_entry *b);
int object_calculate_checksum(const rct_object_entry * entry, const void * data, size_t dataLength);
int find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index);

2
src/object/ObjectManager.cpp
View File

@ -413,7 +413,7 @@ private:
{
const rct_object_entry * entry = &entries[i];
const ObjectRepositoryItem * ori = nullptr;
if (check_object_entry(entry))
if (!object_entry_is_empty(entry))
{
ori = _objectRepository->FindObject(entry);
if (ori == nullptr)

11
src/object_list.c
View File

@ -107,10 +107,15 @@ const rct_object_entry_group object_entry_groups[] = {
(void**)(gStexEntries ), _objectEntriesStexs, // scenario text 0x009ADAE4, 0xF4287C
};
int check_object_entry(const rct_object_entry *entry)
bool object_entry_is_empty(const rct_object_entry *entry)
{
uint32 *dwords = (uint32*)entry;
return (0xFFFFFFFF & dwords[0] & dwords[1] & dwords[2] & dwords[3]) + 1 != 0;
uint64 a, b;
memcpy(&a, (uint8 *)entry, 8);
memcpy(&b, (uint8 *)entry + 4, 8);
if (a == 0xFFFFFFFFFFFFFFFF && b == 0xFFFFFFFFFFFFFFFF) return true;
if (a == 0 && b == 0) return true;
return false;
}
/**