mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Remove duplicate using-MMMMMM variable from Game
game.usingmmmmmm was a duplicate of music.usingmmmmmm, and has been removed.
This commit is contained in:
parent
40b7ddda05
commit
ee44f81d4c
4 changed files with 2 additions and 15 deletions
|
@ -4638,11 +4638,7 @@ void Game::deserializesettings(tinyxml2::XMLElement* dataNode, ScreenSettings* s
|
|||
|
||||
if (pKey == "usingmmmmmm")
|
||||
{
|
||||
if(help.Int(pText)>0){
|
||||
usingmmmmmm = 1;
|
||||
}else{
|
||||
usingmmmmmm = 0;
|
||||
}
|
||||
music.usingmmmmmm = (bool) help.Int(pText);
|
||||
}
|
||||
|
||||
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, "usingmmmmmm", usingmmmmmm);
|
||||
xml::update_tag(dataNode, "usingmmmmmm", music.usingmmmmmm);
|
||||
|
||||
xml::update_tag(dataNode, "ghostsenabled", (int) ghostsenabled);
|
||||
|
||||
|
|
|
@ -198,8 +198,6 @@ public:
|
|||
|
||||
bool glitchrunkludge;
|
||||
|
||||
int usingmmmmmm;
|
||||
|
||||
int gamestate;
|
||||
bool hascontrol, jumpheld;
|
||||
int jumppressed;
|
||||
|
|
|
@ -748,11 +748,6 @@ void menuactionpress()
|
|||
else if (game.currentmenuoption == 6+offset && music.mmmmmm)
|
||||
{
|
||||
//**** TOGGLE MMMMMM
|
||||
if(game.usingmmmmmm > 0){
|
||||
game.usingmmmmmm=0;
|
||||
}else{
|
||||
game.usingmmmmmm=1;
|
||||
}
|
||||
music.usingmmmmmm = !music.usingmmmmmm;
|
||||
music.playef(11);
|
||||
music.play(music.currentsong);
|
||||
|
|
|
@ -276,8 +276,6 @@ int main(int argc, char *argv[])
|
|||
|
||||
if (game.skipfakeload)
|
||||
game.gamestate = TITLEMODE;
|
||||
if(game.usingmmmmmm==0) music.usingmmmmmm=false;
|
||||
if(game.usingmmmmmm==1) music.usingmmmmmm=true;
|
||||
if (game.slowdown == 0) game.slowdown = 30;
|
||||
|
||||
switch(game.slowdown){
|
||||
|
|
Loading…
Reference in a new issue