From 7058756d9c67f64ac0c292de547d34fcc7f2fc86 Mon Sep 17 00:00:00 2001 From: Tom van der Kleij Date: Sat, 6 Sep 2014 23:46:45 +0200 Subject: [PATCH] Incorporated suggested change by @qcz and fixed an enum member name and a compiler warning --- src/sprite.c | 2 +- src/sprite.h | 6 +++--- src/staff.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sprite.c b/src/sprite.c index 45e3989038..e6d589f5b1 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -112,7 +112,7 @@ void reset_0x69EBE4(){ */ rct_sprite *create_sprite(uint8 bl) { - enum SPRITE_LINKEDLIST_OFFSET linkedListTypeOffset = SPRITE_LINKEDLIST_OFFSET_FLOATING_UNKNOWN; // cl + SPRITE_LINKEDLIST_OFFSET linkedListTypeOffset = SPRITE_LINKEDLIST_OFFSET_UNKNOWN; // cl if ((bl & 2) != 0) { diff --git a/src/sprite.h b/src/sprite.h index 957e97360c..567c64af44 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -36,13 +36,13 @@ enum SPRITE_IDENTIFIER{ SPRITE_IDENTIFIER_LITTER = 3, }; -enum SPRITE_LINKEDLIST_OFFSET { +typedef enum { SPRITE_LINKEDLIST_OFFSET_VEHICLE = 2, SPRITE_LINKEDLIST_OFFSET_PEEP = 4, SPRITE_LINKEDLIST_OFFSET_FLOATING_TEXT = 6, SPRITE_LINKEDLIST_OFFSET_FLOATING_LITTER = 8, - SPRITE_LINKEDLIST_OFFSET_FLOATING_UNKNOWN = 10 -}; + SPRITE_LINKEDLIST_OFFSET_UNKNOWN = 10 +} SPRITE_LINKEDLIST_OFFSET; typedef struct { uint8 sprite_identifier; // 0x00 diff --git a/src/staff.c b/src/staff.c index 65290986a9..ce46f47525 100644 --- a/src/staff.c +++ b/src/staff.c @@ -127,7 +127,7 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, RCT2_CALLPROC_X(0x0069EDB6, 0, 0, _ecx, 0, (int)newPeep, 0, 0); } else { - move_sprite_to_list(newPeep, SPRITE_LINKEDLIST_OFFSET_PEEP); + move_sprite_to_list((rct_sprite *)newPeep, SPRITE_LINKEDLIST_OFFSET_PEEP); newPeep->sprite_identifier = 1; newPeep->var_09 = 0x0F;