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

Fix travis errors

This commit is contained in:
Duncan Frost 2014-10-01 20:08:40 +01:00
parent 593acfc867
commit e2c78f236c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object.c
View File

@ -292,7 +292,7 @@ void object_unload(int groupIndex, rct_object_entry_extended *entry)
RCT2_CALLPROC_X(0x006A9CAF, 0, groupIndex, 0, 0, 0, 0, (int)entry); RCT2_CALLPROC_X(0x006A9CAF, 0, groupIndex, 0, 0, 0, 0, (int)entry);
} }
static int object_entry_compare(rct_object_entry *a, rct_object_entry *b) int object_entry_compare(rct_object_entry *a, rct_object_entry *b)
{ {
if (a->flags & 0xF0) { if (a->flags & 0xF0) {
if ((a->flags & 0x0F) != (b->flags & 0x0F)) if ((a->flags & 0x0F) != (b->flags & 0x0F))

2
src/object.h
View File

@ -45,7 +45,7 @@ typedef struct {
uint32 extended; uint32 extended;
} rct_object_entry_extended; } rct_object_entry_extended;
int object_entry_group_counts[]; extern int object_entry_group_counts[];
void object_list_load(); void object_list_load();
int object_read_and_load_entries(FILE *file); int object_read_and_load_entries(FILE *file);