system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

FlappyBug: Unify the way of getting the final score

Browse source 
Previously we would display the score rounded to the nearest integer,
but save the high score by using a static_cast<u32>, which would
always round the score down. This could lead to the final score being
higher than the new high score, when they should be equal.
Now we always round the score to the nearest integer.
This commit is contained in:
0GreenClover0 2023-11-01 03:09:21 +01:00 committed by Andreas Kling
parent 7976e1852c
commit 88cc019275
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Userland/Games/FlappyBug/Game.cpp
View file

@ -30,7 +30,7 @@ void Game::reset()
void Game::game_over()
{
if (on_game_end)
m_high_score = on_game_end(static_cast<u32>(m_difficulty));
m_high_score = on_game_end(get_final_score(m_difficulty));
reset();
}
@ -73,7 +73,7 @@ void Game::paint_event(GUI::PaintEvent& event)
if (m_active) {
painter.draw_text(m_score_rect, String::formatted("{:.0}", m_difficulty).release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::TopLeft, Color::White);
} else if (m_high_score.has_value()) {
auto message = String::formatted("Your score: {:.0}\nHigh score: {:.0}\n\n{}", m_last_score, m_high_score.value(), m_restart_cooldown < 0 ? "Press any key to play again" : " ").release_value_but_fixme_should_propagate_errors();
auto message = String::formatted("Your score: {}\nHigh score: {}\n\n{}", get_final_score(m_last_score), m_high_score.value(), m_restart_cooldown < 0 ? "Press any key to play again" : " ").release_value_but_fixme_should_propagate_errors();
painter.draw_text(m_text_rect, message, Gfx::TextAlignment::Center, Color::White);
} else {
painter.draw_text(m_text_rect, "Press any key to start"sv, Gfx::TextAlignment::Center, Color::White);
@ -150,4 +150,9 @@ void Game::tick()
queue_update();
}
u32 Game::get_final_score(float score)
{
return static_cast<u32>(roundf(score));
}
}

4
Userland/Games/FlappyBug/Game.h
View file

@ -39,6 +39,8 @@ private:
bool ready_to_start() const;
void player_input();
static u32 get_final_score(float score);
public:
struct Bug {
float const x { 50 };
@ -169,7 +171,7 @@ private:
Obstacle m_obstacle;
Cloud m_cloud;
bool m_active;
Optional<float> m_high_score {};
Optional<u32> m_high_score {};
float m_last_score {};
float m_difficulty {};
float m_restart_cooldown {};