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

Small refactoring of load packed

This commit is contained in:
Duncan 2014-09-29 12:58:48 +01:00 committed by Duncan Frost
parent 760ecf1525
commit 44a4862466
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/object_list.c
View File

@ -34,6 +34,7 @@ typedef struct {
uint32 var_10;
} rct_plugin_header;
// 98DA00
int object_entry_group_counts[] = {
128, // rides
252, // small scenery
@ -235,21 +236,23 @@ int object_load_packed(FILE *file)
}
int type = entry->flags & 0x0F;
int ecx = 0;
// ecx
int entryGroupIndex = 0;
for (; ecx < RCT2_ADDRESS(0x98DA00, uint16)[type]; ecx++){
if (RCT2_ADDRESS(0x98D97C, uint32*)[type * 2][ecx] == -1){
for (; entryGroupIndex < object_entry_group_counts[type]; entryGroupIndex++){
if (RCT2_ADDRESS(0x98D97C, uint32*)[type * 2][entryGroupIndex] == -1){
break;
}
}
if (ecx == RCT2_ADDRESS(0x98DA00, uint16)[type]){
if (entryGroupIndex == object_entry_group_counts[type]){
rct2_free(chunk);
return 0;
}
RCT2_ADDRESS(0x98D97C, uint8**)[type * 2][ecx] = chunk;
int* edx = (int*)(ecx * 20 + RCT2_ADDRESS(0x98D980, uint32)[type * 2]);
RCT2_ADDRESS(0x98D97C, uint8**)[type * 2][entryGroupIndex] = chunk;
int* edx = (int*)(entryGroupIndex * 20 + RCT2_ADDRESS(0x98D980, uint32)[type * 2]);
memcpy(edx, (int*)entry, 20);
//6aa429
int eax = 1;//, ebx = 0, ecx = 0, edx = 0, esi = 0, edi = 0, ebp = 0;