TextScroller: Use exit script properly

fixes #3219

Author: Hypernoot

src/object/textscroller.cpp

@@ -299,9 +299,13 @@ TextScroller::update(float dt_sec)
 
     // use start or escape keys to exit
     if (controller->pressed_any(Control::START, Control::ESCAPE) &&
-        !m_fading  && m_finish_script.empty()) {
+        !m_fading) {
       m_fading = true;
-      ScreenManager::current()->pop_screen(std::make_unique<FadeToBlack>(FadeToBlack::FADEOUT, 0.5f));
+      if (!m_finish_script.empty()) {
+        Sector::get().run_script(m_finish_script, "finishscript");
+      } else {
+        ScreenManager::current()->pop_screen(std::make_unique<FadeToBlack>(FadeToBlack::FADEOUT, 0.5f));
+      }
       return;
     }
   }
@@ -310,17 +314,17 @@ TextScroller::update(float dt_sec)
 
   if (m_scroll < 0)
     m_scroll = 0;
-  if (!m_finish_script.empty())
-  {
-    Sector::get().run_script(m_finish_script, "finishscript");
-  }
   else
   {
     // close when done
     if (m_finished && !m_fading)
     {
-	  m_fading = true;
-      ScreenManager::current()->pop_screen(std::unique_ptr<ScreenFade>(new FadeToBlack(FadeToBlack::FADEOUT, 0.25f)));
+      m_fading = true;
+      if (!m_finish_script.empty()) {
+        Sector::get().run_script(m_finish_script, "finishscript");
+      } else {
+        ScreenManager::current()->pop_screen(std::unique_ptr<ScreenFade>(new FadeToBlack(FadeToBlack::FADEOUT, 0.25f)));
+      }
     }
   }
 }

src/object/textscroller.hpp

@@ -51,6 +51,7 @@ class TextScroller : public LayerObject
 
   inline void set_default_speed(float default_speed) { m_default_speed = default_speed; }
   inline bool is_finished() const { return m_finished; }
+  inline bool is_fading() const { return m_fading; }
 
 protected:
   const Controller* controller;

src/supertux/game_session.cpp

@@ -32,6 +32,7 @@
 #include "object/music_object.hpp"
 #include "object/player.hpp"
 #include "object/spawnpoint.hpp"
+#include "object/textscroller.hpp"
 #include "sdk/integration.hpp"
 #include "squirrel/squirrel_virtual_machine.hpp"
 #include "supertux/constants.hpp"
@@ -312,6 +313,14 @@ GameSession::on_escape_press(bool force_quick_respawn)
     return;   // Don't let the player open the menu, when Tux is dying.
   }
 
+  int textscrollers = m_currentsector->get_object_count<TextScroller>([](const TextScroller& ts) {
+    return !ts.is_fading();
+  });
+  
+  if (textscrollers) {
+    return;
+  }
+
   if (m_level->m_is_in_cutscene && !m_level->m_skip_cutscene)
   {
     m_level->m_skip_cutscene = true;