From 9de2520a8a810fcfc27ff5f74f3fb72a4afb1269 Mon Sep 17 00:00:00 2001 From: Tom van der Kleij Date: Fri, 5 Sep 2014 23:47:18 +0200 Subject: [PATCH] Fixing some travis compilation errors due to compiler used there being more strict than visual studio 2013 --- src/sprite.c | 4 ++-- src/sprite.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sprite.c b/src/sprite.c index 53d6549eea..c7836cda65 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -132,7 +132,7 @@ rct_sprite *create_sprite(uint8 bl) rct_unk_sprite *sprite = &(g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]).unknown; - move_sprite_to_list(sprite, linkedListTypeOffset); + move_sprite_to_list((rct_sprite *)sprite, linkedListTypeOffset); sprite->x = SPRITE_LOCATION_NULL; sprite->y = SPRITE_LOCATION_NULL; @@ -159,7 +159,7 @@ rct_sprite *create_sprite(uint8 bl) */ void move_sprite_to_list(rct_sprite *sprite, uint8 cl) { - rct_unk_sprite *unkSprite = sprite; + rct_unk_sprite *unkSprite = &sprite->unknown; // No need to move if the sprite is already in the desired list if (unkSprite->linked_list_type_offset == cl) diff --git a/src/sprite.h b/src/sprite.h index 73e7d48c64..3bd33e641b 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -100,6 +100,6 @@ void create_balloon(int x, int y, int z, int colour); rct_sprite *create_sprite(uint8 bl); void reset_sprite_list(); void reset_0x69EBE4(); -void move_sprite_to_list(rct_sprite *sprite, int ecx); +void move_sprite_to_list(rct_sprite *sprite, uint8 cl); #endif