From 3758d61fe92537ffe68a3ab5e93103edaf36373f Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Thu, 29 Dec 2022 15:47:03 -0800
Subject: [PATCH] Axe scriptclass::resetgametomenu

This creates the game over screen for dying in No Death Mode. It's three
lines long and it's only called once. There's no reason it has to be a
separate function. From the name it sounds like it was meant to be a
generic function but it's anything but that. So just inline it in to
where it's called.
---
 desktop_version/src/Logic.cpp  | 4 +++-
 desktop_version/src/Script.cpp | 7 -------
 desktop_version/src/Script.h   | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index a54411a5..16cdede8 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -464,7 +464,9 @@ void gamelogic(void)
                 if (graphics.fademode == FADE_FULLY_BLACK)
                 {
                     game.copyndmresults();
-                    script.resetgametomenu();
+                    obj.entities.clear();
+                    game.quittomenu();
+                    game.createmenu(Menu::gameover);
                 }
             }
             else
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index 4fe50db8..f1bd5dfc 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -2365,13 +2365,6 @@ void scriptclass::run(void)
     }
 }
 
-void scriptclass::resetgametomenu(void)
-{
-    obj.entities.clear();
-    game.quittomenu();
-    game.createmenu(Menu::gameover);
-}
-
 static void gotoerrorloadinglevel(void)
 {
     game.createmenu(Menu::errorloadinglevel);
diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h
index a648f28d..248adad4 100644
--- a/desktop_version/src/Script.h
+++ b/desktop_version/src/Script.h
@@ -77,8 +77,6 @@ public:
 
     void run(void);
 
-    void resetgametomenu(void);
-
     void startgamemode(enum StartMode mode);
 
     void teleport(void);