From 2bb4274f057f1c6ed4d5f16309a3583b3b38da0f Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 4 Sep 2014 23:27:16 +0100 Subject: [PATCH] fix warnings --- src/ride.c | 1 - src/sprite.c | 6 +++--- src/staff.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ride.c b/src/ride.c index af8530288b..7637de70fb 100644 --- a/src/ride.c +++ b/src/ride.c @@ -448,7 +448,6 @@ void ride_construct_new(int list_item) //Looks like edi became the ride index after the command. eax = edi; rct_window *w; - short widgetIndex; //TODO: replace with window_ride_main_open(eax) // window_ride_main_open(eax); diff --git a/src/sprite.c b/src/sprite.c index 96dbdc4596..ec511dfaeb 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -114,7 +114,7 @@ rct_sprite *create_sprite(uint8 bl) { int ecx = 0xA; - if ((bl & 2 != 0)) + if ((bl & 2) != 0) { // 69EC96; uint16 cx = 0x12C - RCT2_GLOBAL(0x13573CE, uint16); @@ -130,7 +130,7 @@ rct_sprite *create_sprite(uint8 bl) return NULL; } - rct_unk_sprite *sprite = &g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]; + rct_unk_sprite *sprite = &(g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]).unknown; RCT2_CALLPROC_X(0x0069ED0B, 0, 0, ecx, 0, (int)sprite, 0, 0); @@ -147,5 +147,5 @@ rct_sprite *create_sprite(uint8 bl) sprite->var_02 = RCT2_GLOBAL(0xF3EF60, uint16); RCT2_GLOBAL(0xF3EF60, uint16) = sprite->sprite_index; - return sprite; + return (rct_sprite*)sprite; } \ No newline at end of file diff --git a/src/staff.c b/src/staff.c index 4fe6e6eb68..cead4581e3 100644 --- a/src/staff.c +++ b/src/staff.c @@ -111,10 +111,10 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, int newStaffId = i; - int _eax, _ebx, _ecx = _cx, _edx, _edi, _ebp; + int _eax, _ebx, _ecx = _cx, _edx; _ebx = _bl; - rct_peep* newPeep = create_sprite(_bl); + rct_peep* newPeep = &(create_sprite(_bl)->peep); if (newPeep == NULL) {