mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-26 14:38:30 +02:00
Code Issues Releases Wiki Activity

Remove duplicate function musicclass::stopmusic()

Browse Source 
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).
This commit is contained in:
Misa 2020-04-03 15:44:04 -07:00 committed by Ethan Lee
parent 34395435f0
commit c278f05397
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop_version/src/Music.cpp
View File

@ -269,12 +269,6 @@ void musicclass::play(int t)
} }
} }
void musicclass::stopmusic()
{
Mix_HaltMusic();
currentsong = -1;
}
void musicclass::haltdasmusik() void musicclass::haltdasmusik()
{ {
Mix_HaltMusic(); Mix_HaltMusic();

1
desktop_version/src/Music.h
View File

@ -13,7 +13,6 @@ public:
void init(); void init();
void play(int t); void play(int t);
void stopmusic();
void haltdasmusik(); void haltdasmusik();
void silencedasmusik(); void silencedasmusik();
void fadeMusicVolumeIn(int ms); void fadeMusicVolumeIn(int ms);

4
desktop_version/src/editor.cpp
View File

@ -3458,7 +3458,7 @@ void editorlogic()
map.colstate = 10; map.colstate = 10;
game.gamestate = 1; game.gamestate = 1;
graphics.fademode = 4; graphics.fademode = 4;
music.stopmusic(); music.haltdasmusik();
music.play(6); music.play(6);
map.nexttowercolour(); map.nexttowercolour();
ed.settingsmod=false; ed.settingsmod=false;
@ -4398,7 +4398,7 @@ void editorinput()
game.edsavedir=1-edentity[testeditor].p1; game.edsavedir=1-edentity[testeditor].p1;
} }
music.stopmusic(); music.haltdasmusik();
graphics.backgrounddrawn=false; graphics.backgrounddrawn=false;
ed.returneditoralpha = 1000; // Let's start it higher than 255 since it gets clamped ed.returneditoralpha = 1000; // Let's start it higher than 255 since it gets clamped
script.startgamemode(21); script.startgamemode(21);