Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions games/BelowTheSurface/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -532,24 +532,24 @@ void IdleState::get_input()
this->player->set_facing_left(true);
this->player->change_state(new RunState(0), "RunLeft");
}
if (key_down(player->input.right_key))
else if (key_down(player->input.right_key))
{
this->player->set_facing_left(false);
this->player->change_state(new RunState(0), "RunRight");
}
if ((key_typed(player->input.jump_key) || key_typed(player->input.jump_key2)) && player->is_on_floor())
else if ((key_typed(player->input.jump_key) || key_typed(player->input.jump_key2)) && player->is_on_floor())
{
this->player->change_state(new JumpRiseState, "JumpRise");
}
if (key_typed(Z_KEY))
else if (key_typed(Z_KEY))
{
this->player->change_state(new DanceState, "Dance");
}
if (key_typed(player->input.attack_key))
else if (key_typed(player->input.attack_key))
{
this->player->change_state(new AttackState, "Attack");
}
if (key_down(player->input.crouch_key))
else if (key_down(player->input.crouch_key))
{
this->player->change_state(new CrouchState, "Crouch");
}
Expand Down Expand Up @@ -603,7 +603,7 @@ void RunState::get_input()
{
this->player->change_state(new IdleState, "Idle");
}
if ((key_typed(player->input.jump_key) || key_typed(player->input.jump_key2)) && player->is_on_floor())
else if ((key_typed(player->input.jump_key) || key_typed(player->input.jump_key2)) && player->is_on_floor())
{
this->player->change_state(new JumpRiseState, "JumpRise");
}
Expand Down Expand Up @@ -648,7 +648,7 @@ void JumpRiseState::get_input()
if (sprite_dx(player->get_player_sprite()) > -MAX_RUN_SPEED)
sprite_set_dx(player->get_player_sprite(), sprite_dx(player->get_player_sprite()) - RUN_ACCEL);
}
if (key_down(player->input.right_key))
else if (key_down(player->input.right_key))
{
if (sprite_dx(player->get_player_sprite()) < MAX_RUN_SPEED)
sprite_set_dx(player->get_player_sprite(), sprite_dx(player->get_player_sprite()) + RUN_ACCEL);
Expand Down Expand Up @@ -881,6 +881,7 @@ void ClimbState::get_input()
{
this->player->change_state(new IdleState, "Idle");
}
return; // to avoid SEGFAULT when this->player is lost after change_state
}
if (key_released(player->input.jump_key) || key_released(player->input.jump_key2) || key_released(player->input.crouch_key))
{
Expand Down
4 changes: 4 additions & 0 deletions games/BelowTheSurface/screen.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,10 @@ void CompanyIntroScreen::update()
alpha = screen_effect(alpha, screen_time, "ScreenTimer", 2);

if(time_up)
{
this->screen->change_state(new TeamIntroScreen, "TeamIntro");
return; // prevents SEGFAULT
}

if(key_typed(RETURN_KEY) || key_typed(screen->input_key))
{
Expand Down Expand Up @@ -812,6 +815,7 @@ void LevelScreen::update()
this->screen->level_number = 1;
this->screen->current_level = get_next_level(this->screen->level_number,this->screen->get_cell_sheets(),this->screen->get_tile_size(),this->screen->get_players());
this->screen->change_state(new GameOverScreen, "GameOver");
return; // prevents SEGFAULT after change_state
}
}

Expand Down
Loading