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);