From f7607f71abb6360171653f16857a15e4f9a3dbc4 Mon Sep 17 00:00:00 2001 From: Sara Date: Thu, 23 Nov 2023 09:15:16 +0100 Subject: [PATCH] fix: PlayerIdleUpdate return value is now const State* in line with DefineState requirements --- game/src/player.c | 12 ++---------- game/src/player.h | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/game/src/player.c b/game/src/player.c index 24bfca0..43230bf 100644 --- a/game/src/player.c +++ b/game/src/player.c @@ -50,11 +50,8 @@ Player* MakePlayer() { Player* SpawnPlayer(Vector location) { Player* self = MakePlayer(); - self->transform.position = location; - game_world_add_entity(Player_as_BehaviourEntity(self)); - return self; } @@ -106,12 +103,7 @@ void PlayerIdleEnter(Player* self) { self->sprite = sprite_from_spritesheet(self->stand, 0); } -void PlayerIdleUpdate(Player* self, float deltaTime) { +const State* PlayerIdleUpdate(Player* self, float deltaTime) { PlayerAnimationUpdate(self, deltaTime); - - if(sprite_get_time_normalized(self->sprite)) { - return PlayerIdle(); - } else { - return PlayerIdle(); - } + return PlayerIdle(); } diff --git a/game/src/player.h b/game/src/player.h index fbec059..bf7ba0d 100644 --- a/game/src/player.h +++ b/game/src/player.h @@ -66,7 +66,7 @@ extern const State* PlayerAnimationUpdate(Player* player, float deltaTime); extern void PlayerAnimationExit(Player* player); extern void PlayerIdleEnter(Player* player); -extern void PlayerIdleUpdate(Player* player, float deltaTime); +extern const State* PlayerIdleUpdate(Player* player, float deltaTime); DefineState(PlayerIdle, Player, PlayerIdleEnter,