diff --git a/scenes/components.h b/scenes/components.h index de2761b..8cad75d 100644 --- a/scenes/components.h +++ b/scenes/components.h @@ -163,7 +163,6 @@ typedef struct _CSprite_t { float rotation_speed; // Degree / s Vector2 offset; uint8_t depth; - bool pause; } CSprite_t; typedef struct _CMoveable_t { diff --git a/scenes/game_systems.c b/scenes/game_systems.c index 37a4a7f..05599c7 100644 --- a/scenes/game_systems.c +++ b/scenes/game_systems.c @@ -1124,7 +1124,6 @@ void moveable_update_system(Scene_t* scene) if (p_other_bbox != NULL) { any_solid |= p_other_bbox->solid; - //any_solid |= true; break; } } diff --git a/scenes/player_ent.c b/scenes/player_ent.c index cdb6dc8..2f69623 100644 --- a/scenes/player_ent.c +++ b/scenes/player_ent.c @@ -39,7 +39,7 @@ static unsigned int player_sprite_transition_func(Entity_t* ent) p_spr->node.flip &= ~1; } - p_spr->pause = false; + p_spr->anim_timer.pause = false; if (p_move->ground_state & 1) { @@ -54,7 +54,7 @@ static unsigned int player_sprite_transition_func(Entity_t* ent) } else if (p_plr->ladder_state) { - p_spr->pause = Vector2LengthSqr(p_ctrans->velocity) < 10.0f; + p_spr->anim_timer.pause = Vector2LengthSqr(p_ctrans->velocity) < 10.0f; return SPR_PLAYER_LADDER; } else if (p_move->water_state & 1) @@ -179,7 +179,7 @@ static unsigned int player_finish_transition_func(Entity_t* ent) // Due to index-from-0 if (p_spr->current_frame == p_spr->sprites[p_spr->current_idx].sprite->frame_count - 1) { - p_spr->pause = true; + p_spr->anim_timer.pause = true; //remove_entity(ent->manager, ent->m_id); } return p_spr->current_idx;