Skip to content

TextScroller: Use finish_script properly #3294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TextScroller: Use finish_script properly #3294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bd38a3
TextScroller: Use exit script properly
Hypernoot Jul 3, 2025
18c3ed5
TextScroller: create a function start_fading from existing code
Hypernoot Jul 12, 2025
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
23 changes: 14 additions & 9 deletions src/object/textscroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,8 @@ 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 = true;
ScreenManager::current()->pop_screen(std::make_unique<FadeToBlack>(FadeToBlack::FADEOUT, 0.5f));
!m_fading) {
start_fading();
return;
}
}
Expand All @@ -310,21 +309,27 @@ 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)));
start_fading();
}
}
}

void
TextScroller::start_fading()
{
m_fading = true;
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));
}
}

void
TextScroller::scroll(float offset)
{
Expand Down
2 changes: 2 additions & 0 deletions src/object/textscroller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,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;
Expand All @@ -60,6 +61,7 @@ class TextScroller : public LayerObject
void parse_file(const std::string& filename);
void parse_root(const ReaderObject& root);
void parse_content(const ReaderCollection& collection);
void start_fading();

private:
std::string m_filename;
Expand Down
9 changes: 9 additions & 0 deletions src/supertux/game_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
Loading