mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-05 02:39:41 +01:00
Code Issues Releases Wiki Activity

Remove duplicate using-MMMMMM variable from Game

Browse source 
game.usingmmmmmm was a duplicate of music.usingmmmmmm, and has been
removed.
This commit is contained in:
Misa 2020-11-12 16:48:39 -08:00 committed by Ethan Lee
parent 40b7ddda05
commit ee44f81d4c
4 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop_version/src/Game.cpp
View file

@ -4638,11 +4638,7 @@ void Game::deserializesettings(tinyxml2::XMLElement* dataNode, ScreenSettings* s
if (pKey == "usingmmmmmm") if (pKey == "usingmmmmmm")
{ {
if(help.Int(pText)>0){ music.usingmmmmmm = (bool) help.Int(pText);
usingmmmmmm = 1;
}else{
usingmmmmmm = 0;
}
} }
if (pKey == "ghostsenabled") if (pKey == "ghostsenabled")
@ -4882,7 +4878,7 @@ void Game::serializesettings(tinyxml2::XMLElement* dataNode)
xml::update_tag(dataNode, "advanced_smoothing", graphics.screenbuffer->badSignalEffect); xml::update_tag(dataNode, "advanced_smoothing", graphics.screenbuffer->badSignalEffect);
xml::update_tag(dataNode, "usingmmmmmm", usingmmmmmm); xml::update_tag(dataNode, "usingmmmmmm", music.usingmmmmmm);
xml::update_tag(dataNode, "ghostsenabled", (int) ghostsenabled); xml::update_tag(dataNode, "ghostsenabled", (int) ghostsenabled);

2
desktop_version/src/Game.h
View file

@ -198,8 +198,6 @@ public:
bool glitchrunkludge; bool glitchrunkludge;
int usingmmmmmm;
int gamestate; int gamestate;
bool hascontrol, jumpheld; bool hascontrol, jumpheld;
int jumppressed; int jumppressed;

5
desktop_version/src/Input.cpp
View file

@ -748,11 +748,6 @@ void menuactionpress()
else if (game.currentmenuoption == 6+offset && music.mmmmmm) else if (game.currentmenuoption == 6+offset && music.mmmmmm)
{ {
//**** TOGGLE MMMMMM //**** TOGGLE MMMMMM
if(game.usingmmmmmm > 0){
game.usingmmmmmm=0;
}else{
game.usingmmmmmm=1;
}
music.usingmmmmmm = !music.usingmmmmmm; music.usingmmmmmm = !music.usingmmmmmm;
music.playef(11); music.playef(11);
music.play(music.currentsong); music.play(music.currentsong);

2
desktop_version/src/main.cpp
View file

@ -276,8 +276,6 @@ int main(int argc, char *argv[])
if (game.skipfakeload) if (game.skipfakeload)
game.gamestate = TITLEMODE; game.gamestate = TITLEMODE;
if(game.usingmmmmmm==0) music.usingmmmmmm=false;
if(game.usingmmmmmm==1) music.usingmmmmmm=true;
if (game.slowdown == 0) game.slowdown = 30; if (game.slowdown == 0) game.slowdown = 30;
switch(game.slowdown){ switch(game.slowdown){