Tweaks to WalkerHackScreen

diff --git a/src/screen_walker_hack.cc b/src/screen_walker_hack.cc
index dccf42c344e60793622310233a9d746da7169bfe..c07a22fdf852d31903989f1c6758675be9e23a50 100644 (file)
--- a/src/screen_walker_hack.cc
+++ b/src/screen_walker_hack.cc
@@ -27,7 +27,8 @@ WalkerHackScreen::WalkerHackScreen(ScreenStack::Weak ss_weak,
       type_j_size(1),
       type_a_size(1),
       type_l_size(1),
-      button_type(BUTTON_TYPE_F) {
+      button_type(BUTTON_TYPE_F),
+      screen_pop_requested(false) {
   button_type =
       (ButtonType)((int)(call_js_get_random() * (float)BUTTON_TYPE_SIZE));
   *walker_hack_success = false;
@@ -42,14 +43,14 @@ bool WalkerHackScreen::update(float dt, bool resized) {
   }
 
   timer -= dt;
-  if (timer < 0.0F) {
+  if (timer < 0.0F && !screen_pop_requested) {
 #ifndef NDEBUG
     std::clog << "WalkerHackScreen: timer ended.\n";
 #endif
-    timer = WALKER_HACK_SCREEN_DURATION;
     auto s_stack = stack.lock();
     if (s_stack) {
       s_stack->pop_screen();
+      screen_pop_requested = true;
     }
   }
 
@@ -139,9 +140,10 @@ bool WalkerHackScreen::draw(RenderTexture *render_texture) {
            GetScreenWidth() / 2 - instructions_size / 2,
            (GetScreenHeight() / 4) * 3, instructions_font_size, WHITE);
 
-  float ratio =
-      (WALKER_HACK_SCREEN_DURATION - timer) / WALKER_HACK_SCREEN_DURATION;
-  DrawRectangle(GetScreenWidth() * ratio,
+  float ratio = timer > 0.0F ? (WALKER_HACK_SCREEN_DURATION - timer) /
+                                   WALKER_HACK_SCREEN_DURATION
+                             : 1.0F;
+  DrawRectangle(GetScreenWidth() * ratio / 2.0F,
                 (float)GetScreenHeight() * BUTTON_FONT_SIZE_RATIO * 2.0F +
                     BUTTON_DRAW_OFFSET * 3.0F,
                 GetScreenWidth() * (1.0F - ratio), 30, GREEN);

diff --git a/src/screen_walker_hack.h b/src/screen_walker_hack.h
index 9ca1fb91e55a0b6f5ce4efac9cfe2afe2b5540ed..a1aa1eb521763c4683adaf84a483206ca529c8ef 100644 (file)
--- a/src/screen_walker_hack.h
+++ b/src/screen_walker_hack.h
@@ -43,6 +43,7 @@ class WalkerHackScreen : public Screen {
   int type_a_size;
   int type_l_size;
   ButtonType button_type;
+  bool screen_pop_requested;
 
   void set_sizes();
 };