From c278f05397eec51426989b134a121c8551128a44 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Fri, 3 Apr 2020 15:44:04 -0700
Subject: [PATCH] Remove duplicate function musicclass::stopmusic()

It is an exact duplicate of musicclass::haltdasmusik(), so use that
function instead and update callers. Looks like
musicclass::haltdasmusik() came first, anyway (musicclass::stopmusic()
was only used in editor.cpp).
---
 desktop_version/src/Music.cpp  | 6 ------
 desktop_version/src/Music.h    | 1 -
 desktop_version/src/editor.cpp | 4 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 0a6d26fa..83bfe514 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -269,12 +269,6 @@ void musicclass::play(int t)
 	}
 }
 
-void musicclass::stopmusic()
-{
-	Mix_HaltMusic();
-	currentsong = -1;
-}
-
 void musicclass::haltdasmusik()
 {
 	Mix_HaltMusic();
diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h
index 8d5308fc..3e479120 100644
--- a/desktop_version/src/Music.h
+++ b/desktop_version/src/Music.h
@@ -13,7 +13,6 @@ public:
 	void init();
 
 	void play(int t);
-	void stopmusic();
 	void haltdasmusik();
 	void silencedasmusik();
 	void fadeMusicVolumeIn(int ms);
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 4ea53dd8..308985f0 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -3458,7 +3458,7 @@ void editorlogic()
         map.colstate = 10;
         game.gamestate = 1;
         graphics.fademode = 4;
-        music.stopmusic();
+        music.haltdasmusik();
         music.play(6);
         map.nexttowercolour();
         ed.settingsmod=false;
@@ -4398,7 +4398,7 @@ void editorinput()
                             game.edsavedir=1-edentity[testeditor].p1;
                         }
 
-                        music.stopmusic();
+                        music.haltdasmusik();
                         graphics.backgrounddrawn=false;
                         ed.returneditoralpha = 1000; // Let's start it higher than 255 since it gets clamped
                         script.startgamemode(21);