diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index fe714bc6..ef8f99f4 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -714,6 +714,25 @@ void Game::actionprompt_textbox(void) graphics.textboxcenterx(); } +void Game::savetele_textbox(void) +{ + if (inspecial() || map.custommode) + { + return; + } + + if (savetele()) + { + graphics.createtextboxflipme(" Game Saved ", -1, 12, 174, 174, 174); + graphics.textboxtimer(25); + } + else + { + graphics.createtextboxflipme(" ERROR: Could not save game! ", -1, 12, 255, 60, 60); + graphics.textboxtimer(50); + } +} + void Game::updatestate(void) { statedelay--; @@ -2000,24 +2019,8 @@ void Game::updatestate(void) case 2000: //Game Saved! - if (inspecial() || map.custommode) - { - state = 0; - } - else - { - if (savetele()) - { - graphics.createtextbox(" Game Saved ", -1, graphics.flipmode ? 202 : 12, 174, 174, 174); - graphics.textboxtimer(25); - } - else - { - graphics.createtextbox(" ERROR: Could not save game! ", -1, graphics.flipmode ? 202 : 12, 255, 60, 60); - graphics.textboxtimer(50); - } - state = 0; - } + savetele_textbox(); + state = 0; break; case 2500: diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index 04affd33..a8eceb98 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -133,6 +133,7 @@ public: void crewmate_textbox(const int r, const int g, const int b); void remaining_textbox(void); void actionprompt_textbox(void); + void savetele_textbox(void); void updatestate(void); diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 772b85d1..5972dd07 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -3506,19 +3506,7 @@ void scriptclass::teleport(void) { music.changemusicarea(game.teleport_to_x, game.teleport_to_y); } - if (!game.intimetrial && !game.nodeathmode && !game.inintermission) - { - if (game.savetele()) - { - graphics.createtextbox(" Game Saved ", -1, graphics.flipmode ? 202 : 12, 174, 174, 174); - graphics.textboxtimer(25); - } - else - { - graphics.createtextbox(" ERROR: Could not save game! ", -1, graphics.flipmode ? 202 : 12, 255, 60, 60); - graphics.textboxtimer(50); - } - } + game.savetele_textbox(); } }