diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 78fb767f..0e760768 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -3116,7 +3116,7 @@ bool entityclass::updateentities( int i ) entities[i].state = 2; entities[i].onentity = 0; - music.playef(7,10); + music.playef(7); } else if (entities[i].state == 2) { @@ -3164,7 +3164,7 @@ bool entityclass::updateentities( int i ) entities[i].life = 4; entities[i].state = 2; entities[i].onentity = 0; - music.playef(6,10); + music.playef(6); /*}else if (entities[j].vy <= -0.5 && (entities[j].yp>=entities[i].yp+2)) { entities[i].life = 4; entities[i].state = 2; entities[i].onentity = 0; @@ -3204,7 +3204,7 @@ bool entityclass::updateentities( int i ) if (entities[i].state == 1) { game.coins++; - music.playef(4,10); + music.playef(4); collect[entities[i].para] = 1; entities[i].active = false; @@ -3218,14 +3218,14 @@ bool entityclass::updateentities( int i ) if (game.intimetrial) { collect[entities[i].para] = 1; - music.playef(25,10); + music.playef(25); } else { game.state = 1000; //music.haltdasmusik(); if(music.currentsong!=-1) music.silencedasmusik(); - music.playef(3,10); + music.playef(3); collect[entities[i].para] = 1; if (game.trinkets > game.stat_trinkets) { @@ -3252,7 +3252,7 @@ bool entityclass::updateentities( int i ) entities[i].colour = 5; entities[i].onentity = 0; game.savepoint = entities[i].para; - music.playef(5,10); + music.playef(5); game.savex = entities[i].xp - 4; @@ -3293,7 +3293,7 @@ bool entityclass::updateentities( int i ) entities[i].state = 2; - music.playef(8,10); + music.playef(8); game.gravitycontrol = (game.gravitycontrol + 1) % 2; game.totalflips++; temp = getplayer(); @@ -3672,7 +3672,7 @@ bool entityclass::updateentities( int i ) { entities[i].colour = 5; entities[i].onentity = 0; - music.playef(17,10); + music.playef(17); entities[i].state = 0; } @@ -3840,14 +3840,14 @@ bool entityclass::updateentities( int i ) if (game.intimetrial) { customcollect[entities[i].para] = 1; - music.playef(27,10); + music.playef(27); } else { game.state = 1010; //music.haltdasmusik(); if(music.currentsong!=-1) music.silencedasmusik(); - music.playef(27,10); + music.playef(27); customcollect[entities[i].para] = 1; } @@ -3860,7 +3860,7 @@ bool entityclass::updateentities( int i ) //if inactive, activate! if (entities[i].tile == 1) { - music.playef(18, 10); + music.playef(18); entities[i].onentity = 0; entities[i].tile = 2; entities[i].colour = 101; @@ -5290,7 +5290,7 @@ void entityclass::entitycollisioncheck() { if (entityhlinecollide(i, j)) { - music.playef(8,10); + music.playef(8); game.gravitycontrol = (game.gravitycontrol + 1) % 2; game.totalflips++; if (game.gravitycontrol == 0) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index a315e322..5000cb89 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -915,7 +915,7 @@ void Game::updatestate() if(obj.entities[obj.getplayer()].tile == 0) { obj.entities[obj.getplayer()].tile = 144; - music.playef(2, 10); + music.playef(2); } state = 0; break; @@ -1293,7 +1293,7 @@ void Game::updatestate() break; case 50: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Help! Can anyone hear", 35, 15, 255, 134, 255); graphics.addline("this message?"); graphics.textboxtimer(60); @@ -1301,7 +1301,7 @@ void Game::updatestate() statedelay = 100; break; case 51: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Verdigris? Are you out", 30, 12, 255, 134, 255); graphics.addline("there? Are you ok?"); graphics.textboxtimer(60); @@ -1309,7 +1309,7 @@ void Game::updatestate() statedelay = 100; break; case 52: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Please help us! We've crashed", 5, 22, 255, 134, 255); graphics.addline("and need assistance!"); graphics.textboxtimer(60); @@ -1317,14 +1317,14 @@ void Game::updatestate() statedelay = 100; break; case 53: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Hello? Anyone out there?", 40, 15, 255, 134, 255); graphics.textboxtimer(60); state++; statedelay = 100; break; case 54: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("This is Doctor Violet from the", 5, 8, 255, 134, 255); graphics.addline("D.S.S. Souleye! Please respond!"); graphics.textboxtimer(60); @@ -1332,14 +1332,14 @@ void Game::updatestate() statedelay = 100; break; case 55: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Please... Anyone...", 45, 14, 255, 134, 255); graphics.textboxtimer(60); state++; statedelay = 100; break; case 56: - music.playef(15, 10); + music.playef(15); graphics.createtextbox("Please be alright, everyone...", 25, 18, 255, 134, 255); graphics.textboxtimer(60); state=50; @@ -1423,7 +1423,7 @@ void Game::updatestate() obj.removetrigger(85); //Init final stretch state++; - music.playef(9, 10); + music.playef(9); music.play(2); obj.flags[72] = 1; @@ -1516,7 +1516,7 @@ void Game::updatestate() if (obj.entities[i].onroof > 0 && gravitycontrol == 1) { gravitycontrol = 0; - music.playef(1, 10); + music.playef(1); } if (obj.entities[i].onground > 0) { @@ -1538,13 +1538,13 @@ void Game::updatestate() graphics.createtextbox("Captain! I've been so worried!", 60, 90, 164, 255, 164); state++; - music.playef(12, 10); + music.playef(12); } break; case 104: graphics.createtextbox("I'm glad you're ok!", 135, 152, 164, 164, 255); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 106: @@ -1553,7 +1553,7 @@ void Game::updatestate() graphics.addline("way out, but I keep going"); graphics.addline("around in circles..."); state++; - music.playef(2, 10); + music.playef(2); graphics.textboxactive(); i = obj.getcompanion(); obj.entities[i].tile = 54; @@ -1564,7 +1564,7 @@ void Game::updatestate() graphics.createtextbox("Don't worry! I have a", 125, 152, 164, 164, 255); graphics.addline("teleporter key!"); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 110: @@ -1575,7 +1575,7 @@ void Game::updatestate() obj.entities[i].state = 1; graphics.createtextbox("Follow me!", 185, 154, 164, 164, 255); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); } @@ -1634,7 +1634,7 @@ void Game::updatestate() if (obj.entities[i].onground > 0 && gravitycontrol == 0) { gravitycontrol = 1; - music.playef(1, 10); + music.playef(1); } if (obj.entities[i].onroof > 0) { @@ -1654,34 +1654,34 @@ void Game::updatestate() graphics.createtextbox("Captain! You're ok!", 60-10, 90-40, 255, 255, 134); state++; - music.playef(14, 10); + music.playef(14); break; case 124: graphics.createtextbox("I've found a teleporter, but", 60-20, 90 - 40, 255, 255, 134); graphics.addline("I can't get it to go anywhere..."); state++; - music.playef(2, 10); + music.playef(2); graphics.textboxactive(); i = obj.getcompanion(); //obj.entities[i].tile = 66; obj.entities[i].state = 0; break; case 126: graphics.createtextbox("I can help with that!", 125, 152-40, 164, 164, 255); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 128: graphics.createtextbox("I have the teleporter", 130, 152-35, 164, 164, 255); graphics.addline("codex for our ship!"); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 130: graphics.createtextbox("Yey! Let's go home!", 60-30, 90-35, 255, 255, 134); state++; - music.playef(14, 10); + music.playef(14); graphics.textboxactive(); i = obj.getcompanion(); obj.entities[i].tile = 6; @@ -1698,7 +1698,7 @@ void Game::updatestate() case 200: //Init final stretch state++; - music.playef(9, 10); + music.playef(9); //music.play(2); obj.flags[72] = 1; @@ -2148,7 +2148,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 2501: //Activating a teleporter 2 @@ -2157,7 +2157,7 @@ void Game::updatestate() flashlight = 5; screenshake = 0; //we're done here! - music.playef(10, 10); + music.playef(10); break; case 2502: //Activating a teleporter 2 @@ -2220,7 +2220,7 @@ void Game::updatestate() hascontrol = false; graphics.createtextbox("Hello?", 125+24, 152-20, 164, 164, 255); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 2512: @@ -2228,7 +2228,7 @@ void Game::updatestate() hascontrol = false; graphics.createtextbox("Is anyone there?", 125+8, 152-24, 164, 164, 255); state++; - music.playef(11, 10); + music.playef(11); graphics.textboxactive(); break; case 2514: @@ -2247,28 +2247,28 @@ void Game::updatestate() statedelay = 30; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 3001: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3002: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3003: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3004: //Activating a teleporter 2 @@ -2277,7 +2277,7 @@ void Game::updatestate() flashlight = 5; screenshake = 0; //we're done here! - music.playef(10, 10); + music.playef(10); break; case 3005: //Activating a teleporter 2 @@ -3291,28 +3291,28 @@ void Game::updatestate() statedelay = 30; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 3512: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3513: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3514: //Activating a teleporter 2 state++; statedelay = 15; flashlight = 5; - music.playef(9, 10); + music.playef(9); break; case 3515: //Activating a teleporter 2 @@ -3326,7 +3326,7 @@ void Game::updatestate() obj.entities[i].invis = true; //we're done here! - music.playef(10, 10); + music.playef(10); statedelay = 60; break; case 3516: @@ -3388,7 +3388,7 @@ void Game::updatestate() statedelay = 10; flashlight = 5; screenshake = 10; - music.playef(9, 10); + music.playef(9); break; case 4001: //Activating a teleporter 2 @@ -3397,7 +3397,7 @@ void Game::updatestate() flashlight = 5; screenshake = 0; //we're done here! - music.playef(10, 10); + music.playef(10); break; case 4002: //Activating a teleporter 2 @@ -3431,7 +3431,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4011: //Activating a teleporter 2 @@ -3439,7 +3439,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4012: //Activating a teleporter 2 @@ -3520,7 +3520,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4021: //Activating a teleporter 2 @@ -3528,7 +3528,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4022: //Activating a teleporter 2 @@ -3596,7 +3596,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4031: //Activating a teleporter 2 @@ -3604,7 +3604,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4032: //Activating a teleporter 2 @@ -3672,7 +3672,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4041: //Activating a teleporter 2 @@ -3680,7 +3680,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4042: //Activating a teleporter 2 @@ -3753,7 +3753,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4051: //Activating a teleporter 2 @@ -3761,7 +3761,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4052: //Activating a teleporter 2 @@ -3834,7 +3834,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4061: //Activating a teleporter 2 @@ -3842,7 +3842,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4062: //Activating a teleporter 2 @@ -3913,7 +3913,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4071: //Activating a teleporter 2 @@ -3921,7 +3921,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4072: //Activating a teleporter 2 @@ -3989,7 +3989,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4081: //Activating a teleporter 2 @@ -3997,7 +3997,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4082: //Activating a teleporter 2 @@ -4065,7 +4065,7 @@ void Game::updatestate() statedelay = 15; flashlight = 5; screenshake = 90; - music.playef(9, 10); + music.playef(9); break; case 4091: //Activating a teleporter 2 @@ -4073,7 +4073,7 @@ void Game::updatestate() statedelay = 0; flashlight = 5; screenshake = 0; - music.playef(10, 10); + music.playef(10); break; case 4092: //Activating a teleporter 2 @@ -4799,7 +4799,7 @@ void Game::deathsequence() gameoverdelay = 60; } deathcounts++; - music.playef(2,10); + music.playef(2); obj.entities[i].invis = true; if (map.finalmode) { diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 6af17c42..37a733f4 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -31,7 +31,7 @@ void updatebuttonmappings(int bind) if (!dupe) { game.controllerButton_flip.push_back(i); - music.playef(11, 10); + music.playef(11); } for (size_t j = 0; j < game.controllerButton_map.size(); j += 1) { @@ -60,7 +60,7 @@ void updatebuttonmappings(int bind) if (!dupe) { game.controllerButton_map.push_back(i); - music.playef(11, 10); + music.playef(11); } for (size_t j = 0; j < game.controllerButton_flip.size(); j += 1) { @@ -89,7 +89,7 @@ void updatebuttonmappings(int bind) if (!dupe) { game.controllerButton_esc.push_back(i); - music.playef(11, 10); + music.playef(11); } for (size_t j = 0; j < game.controllerButton_flip.size(); j += 1) { @@ -172,7 +172,7 @@ void titleinput() if (!game.menustart) { game.menustart = true; music.play(6); - music.playef(18, 10); + music.playef(18); game.screenshake = 10; game.flashlight = 5; }else{ @@ -193,7 +193,7 @@ void titleinput() if (key.isDown(27) && game.currentmenuname != "youwannaquit" && game.menustart) { - music.playef(11, 10); + music.playef(11); game.previousmenuname = game.currentmenuname; game.createmenu("youwannaquit"); map.nexttowercolour(); @@ -220,7 +220,7 @@ void titleinput() { game.menustart = true; music.play(6); - music.playef(18, 10); + music.playef(18); game.screenshake = 10; game.flashlight = 5; map.colstate = 10; @@ -235,21 +235,21 @@ void titleinput() if (game.currentmenuoption == 0) { //Bring you to the normal playmenu - music.playef(11, 10); + music.playef(11); game.createmenu("playerworlds"); map.nexttowercolour(); } else if (game.currentmenuoption == 1) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("graphicoptions"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -265,7 +265,7 @@ void titleinput() else if (game.currentmenuoption == 3) { //bye! - music.playef(2, 10); + music.playef(2); game.mainmenu = 100; graphics.fademode = 2; } @@ -284,7 +284,7 @@ void titleinput() else { //Bring you to the normal playmenu - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -292,14 +292,14 @@ void titleinput() else if (game.currentmenuoption == 1) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("graphicoptions"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -315,14 +315,14 @@ void titleinput() else if (game.currentmenuoption == 3) { //Credits - music.playef(11, 10); + music.playef(11); game.createmenu("credits"); map.nexttowercolour(); } else if (game.currentmenuoption == 4) { //bye! - music.playef(2, 10); + music.playef(2); game.mainmenu = 100; graphics.fademode = 2; } @@ -339,7 +339,7 @@ void titleinput() else { //Bring you to the normal playmenu - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -347,21 +347,21 @@ void titleinput() else if (game.currentmenuoption == 1) { //Bring you to the normal playmenu - music.playef(11, 10); + music.playef(11); game.createmenu("playerworlds"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("graphicoptions"); map.nexttowercolour(); } else if (game.currentmenuoption == 3) { //Options - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -377,14 +377,14 @@ void titleinput() else if (game.currentmenuoption == 4) { //Credits - music.playef(11, 10); + music.playef(11); game.createmenu("credits"); map.nexttowercolour(); } else if (game.currentmenuoption == 5) { //bye! - music.playef(2, 10); + music.playef(2); game.mainmenu = 100; graphics.fademode = 2; } @@ -396,12 +396,12 @@ void titleinput() { if(game.currentmenuoption==game.nummenuoptions-1){ //go back to menu - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); }else if(game.currentmenuoption==game.nummenuoptions-2){ //next page - music.playef(11, 10); + music.playef(11); if((size_t) ((game.levelpage*8)+8) >= ed.ListOfMetaData.size()){ game.levelpage=0; }else{ @@ -413,7 +413,7 @@ void titleinput() }else{ //Ok, launch the level! //PLAY CUSTOM LEVEL HOOK - music.playef(11, 10); + music.playef(11); game.playcustomlevel=(game.levelpage*8)+game.currentmenuoption; game.customleveltitle=ed.ListOfMetaData[game.playcustomlevel].title; game.customlevelfilename=ed.ListOfMetaData[game.playcustomlevel].filename; @@ -439,7 +439,7 @@ void titleinput() game.mainmenu = 22; graphics.fademode = 2; }else if(game.currentmenuoption==2){ - music.playef(11, 10); + music.playef(11); game.levelpage=0; game.createmenu("levellist"); map.nexttowercolour(); @@ -451,7 +451,7 @@ void titleinput() #if !defined(NO_EDITOR) if(game.currentmenuoption==0){ - music.playef(11, 10); + music.playef(11); game.levelpage=0; ed.getDirectoryData(); game.loadcustomlevelstats(); //Should only load a file if it's needed @@ -459,12 +459,12 @@ void titleinput() map.nexttowercolour(); }else if(game.currentmenuoption==1){ //LEVEL EDITOR HOOK - music.playef(11, 10); + music.playef(11); game.mainmenu = 20; graphics.fademode = 2; ed.filename=""; }/*else if(game.currentmenuoption==2){ - music.playef(11, 10); + music.playef(11); //"OPENFOLDERHOOK" //When the player selects the "open level folder" menu option, //this is where it should run the appropriate code. @@ -475,13 +475,13 @@ SDL_assert(0 && "Remove open level dir"); }*/else if(game.currentmenuoption==2){ //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } #else if(game.currentmenuoption==0){ - music.playef(11, 10); + music.playef(11); game.levelpage=0; ed.getDirectoryData(); game.loadcustomlevelstats(); //Should only load a file if it's needed @@ -489,7 +489,7 @@ SDL_assert(0 && "Remove open level dir"); map.nexttowercolour(); }else if(game.currentmenuoption==1){ //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -497,28 +497,28 @@ SDL_assert(0 && "Remove open level dir"); } #endif else if(game.currentmenuname=="errornostart"){ - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } else if (game.currentmenuname == "graphicoptions") { if (game.currentmenuoption == 0){ - music.playef(11, 10); + music.playef(11); graphics.screenbuffer->toggleFullScreen(); game.fullscreen = !game.fullscreen; game.savestats(); game.createmenu("graphicoptions"); game.currentmenuoption = 0; }else if (game.currentmenuoption == 1){ - music.playef(11, 10); + music.playef(11); graphics.screenbuffer->toggleStretchMode(); game.stretchMode = (game.stretchMode + 1) % 3; game.savestats(); game.createmenu("graphicoptions"); game.currentmenuoption = 1; }else if (game.currentmenuoption == 2){ - music.playef(11, 10); + music.playef(11); graphics.screenbuffer->toggleLinearFilter(); game.useLinearFilter = !game.useLinearFilter; game.savestats(); @@ -526,7 +526,7 @@ SDL_assert(0 && "Remove open level dir"); game.currentmenuoption = 2; }else if (game.currentmenuoption == 3){ //change smoothing - music.playef(11, 10); + music.playef(11); game.fullScreenEffect_badSignal = !game.fullScreenEffect_badSignal; //Hook the analogue thing in here: ABCDEFG graphics.screenbuffer->badSignalEffect= !graphics.screenbuffer->badSignalEffect; @@ -535,7 +535,7 @@ SDL_assert(0 && "Remove open level dir"); game.currentmenuoption = 3; }else if (game.currentmenuoption == 4) { //toggle mouse cursor - music.playef(11, 10); + music.playef(11); if (graphics.showmousecursor == true) { SDL_ShowCursor(SDL_DISABLE); graphics.showmousecursor = false; @@ -548,7 +548,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -560,7 +560,7 @@ SDL_assert(0 && "Remove open level dir"); { //toggle fullscreen graphics.screenbuffer->toggleFullScreen(); - music.playef(11, 10); + music.playef(11); if (game.fullscreen) { game.fullscreen = false; @@ -576,7 +576,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 1) { //enable acceleration: if in fullscreen, go back to window first - music.playef(11, 10); + music.playef(11); game.advanced_mode = false; if (game.fullscreen) { @@ -593,7 +593,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 2) { //change scaling mode - music.playef(11, 10); + music.playef(11); game.advanced_scaling = (game.advanced_scaling + 1) % 5; graphics.screenbuffer->ResizeScreen(320 *game.advanced_scaling,240*game.advanced_scaling ); graphics.screenbuffer->SetScale(game.advanced_scaling); @@ -606,7 +606,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 3) { //change smoothing - music.playef(11, 10); + music.playef(11); game.advanced_smoothing = !game.advanced_smoothing; updategraphicsmode(); @@ -617,7 +617,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -628,7 +628,7 @@ SDL_assert(0 && "Remove open level dir"); { graphics.screenbuffer->toggleFullScreen(); //toggle fullscreen - music.playef(11, 10); + music.playef(11); if (game.fullscreen) { game.fullscreen = false; @@ -645,7 +645,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 1) { //disable acceleration: if in fullscreen, go back to window first - music.playef(11, 10); + music.playef(11); game.advanced_mode = true; if (game.fullscreen) { @@ -662,7 +662,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -674,13 +674,13 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //bye! - music.playef(2, 10); + music.playef(2); game.mainmenu = 100; graphics.fademode = 2; } else { - music.playef(11, 10); + music.playef(11); game.createmenu(game.previousmenuname); map.nexttowercolour(); } @@ -690,7 +690,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 3; map.nexttowercolour(); @@ -701,7 +701,7 @@ SDL_assert(0 && "Remove open level dir"); //game.deletequick(); //game.deletetele(); game.savestats(); - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 3; map.nexttowercolour(); @@ -712,7 +712,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 4; map.nexttowercolour(); @@ -724,7 +724,7 @@ SDL_assert(0 && "Remove open level dir"); game.deletetele(); game.createmenu("setslowdown2"); map.nexttowercolour(); - music.playef(11, 10); + music.playef(11); } } else if (game.currentmenuname == "setslowdown2") @@ -735,7 +735,7 @@ SDL_assert(0 && "Remove open level dir"); game.gameframerate=34; game.slowdown = 30; game.savestats(); - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 4; map.nexttowercolour(); @@ -745,7 +745,7 @@ SDL_assert(0 && "Remove open level dir"); game.gameframerate=41; game.slowdown = 24; game.savestats(); - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 4; map.nexttowercolour(); @@ -755,7 +755,7 @@ SDL_assert(0 && "Remove open level dir"); game.gameframerate=55; game.slowdown = 18; game.savestats(); - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 4; map.nexttowercolour(); @@ -765,7 +765,7 @@ SDL_assert(0 && "Remove open level dir"); game.gameframerate=83; game.slowdown = 12; game.savestats(); - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); game.currentmenuoption = 4; map.nexttowercolour(); @@ -779,7 +779,7 @@ SDL_assert(0 && "Remove open level dir"); game.colourblindmode = !game.colourblindmode; game.savestats(); map.tdrawback = true; - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 1) { @@ -788,11 +788,11 @@ SDL_assert(0 && "Remove open level dir"); game.savestats(); if (!game.noflashingmode) { - music.playef(18, 10); + music.playef(18); game.screenshake = 10; game.flashlight = 5; }else{ - music.playef(11, 10); + music.playef(11); } } else if (game.currentmenuoption == 2) @@ -800,7 +800,7 @@ SDL_assert(0 && "Remove open level dir"); //disable text outline graphics.notextoutline = !graphics.notextoutline; game.savestats(); - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 3) { @@ -814,31 +814,31 @@ SDL_assert(0 && "Remove open level dir"); { map.invincibility = !map.invincibility; } - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 4) { //change game speed game.createmenu("setslowdown2"); map.nexttowercolour(); - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 5) { // toggle fake load screen game.skipfakeload = !game.skipfakeload; - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 6) { // toggle translucent roomname BG graphics.translucentroomname = !graphics.translucentroomname; - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 7) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -863,7 +863,7 @@ SDL_assert(0 && "Remove open level dir"); else { //Can't do yet! play sad sound - music.playef(2, 10); + music.playef(2); } } else if (game.currentmenuname == "options") @@ -873,7 +873,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //accessibility options - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); map.nexttowercolour(); } @@ -881,14 +881,14 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 1) { //clear data menu - music.playef(11, 10); + music.playef(11); game.createmenu("controller"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //clear data menu - music.playef(11, 10); + music.playef(11); game.createmenu("cleardatamenu"); map.nexttowercolour(); } @@ -903,7 +903,7 @@ SDL_assert(0 && "Remove open level dir"); game.usingmmmmmm=1; } music.usingmmmmmm = !music.usingmmmmmm; - music.playef(11, 10); + music.playef(11); music.play(6); game.savestats(); game.createmenu("mainmenu"); @@ -912,7 +912,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -920,7 +920,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 3) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -930,28 +930,28 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //accessibility options - music.playef(11, 10); + music.playef(11); game.createmenu("accessibility"); map.nexttowercolour(); } else if (game.currentmenuoption == 1) { //unlock play options - music.playef(11, 10); + music.playef(11); game.createmenu("unlockmenu"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //clear data menu - music.playef(11, 10); + music.playef(11); game.createmenu("controller"); map.nexttowercolour(); } else if (game.currentmenuoption == 3) { //clear data menu - music.playef(11, 10); + music.playef(11); game.createmenu("cleardatamenu"); map.nexttowercolour(); } @@ -966,7 +966,7 @@ SDL_assert(0 && "Remove open level dir"); game.usingmmmmmm=1; } music.usingmmmmmm = !music.usingmmmmmm; - music.playef(11, 10); + music.playef(11); music.play(6); game.savestats(); game.createmenu("mainmenu"); @@ -975,7 +975,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 5) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -983,7 +983,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -996,7 +996,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[9] = true; game.unlocknotify[9] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 0; @@ -1005,7 +1005,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[10] = true; game.unlocknotify[10] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 1; @@ -1014,7 +1014,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[11] = true; game.unlocknotify[11] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 2; @@ -1023,7 +1023,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[12] = true; game.unlocknotify[12] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 3; @@ -1032,7 +1032,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[13] = true; game.unlocknotify[13] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 4; @@ -1041,7 +1041,7 @@ SDL_assert(0 && "Remove open level dir"); { game.unlock[14] = true; game.unlocknotify[14] = true; - music.playef(11, 10); + music.playef(11); game.savestats(); game.createmenu("unlockmenutrials"); game.currentmenuoption = 5; @@ -1049,7 +1049,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 6) //back { //back - music.playef(11, 10); + music.playef(11); game.createmenu("unlockmenu"); map.nexttowercolour(); } @@ -1059,14 +1059,14 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //unlock time trials separately... - music.playef(11, 10); + music.playef(11); game.createmenu("unlockmenutrials"); map.nexttowercolour(); } else if (game.currentmenuoption == 1) { //unlock intermissions - music.playef(11, 10); + music.playef(11); game.unlock[16] = true; game.unlocknotify[16] = true; game.unlock[6] = true; @@ -1078,7 +1078,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 2) { //unlock no death mode - music.playef(11, 10); + music.playef(11); game.unlock[17] = true; game.unlocknotify[17] = true; game.savestats(); @@ -1088,7 +1088,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 3) { //unlock flip mode - music.playef(11, 10); + music.playef(11); game.unlock[18] = true; game.unlocknotify[18] = true; game.savestats(); @@ -1098,7 +1098,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 4) { //unlock jukebox - music.playef(11, 10); + music.playef(11); game.stat_trinkets = 20; game.savestats(); game.createmenu("unlockmenu"); @@ -1107,7 +1107,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 5) { //unlock secret lab - music.playef(11, 10); + music.playef(11); game.unlock[8] = true; game.unlocknotify[8] = true; game.savestats(); @@ -1117,7 +1117,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("options"); map.nexttowercolour(); } @@ -1127,14 +1127,14 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.createmenu("credits2"); map.nexttowercolour(); } else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -1144,14 +1144,14 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.createmenu("credits25"); map.nexttowercolour(); } else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -1161,14 +1161,14 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.createmenu("credits3"); map.nexttowercolour(); } else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -1178,7 +1178,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.current_credits_list_index += 9; if (game.current_credits_list_index >= (int)game.superpatrons.size()) @@ -1198,7 +1198,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.current_credits_list_index = 0; game.createmenu("mainmenu"); map.nexttowercolour(); @@ -1209,7 +1209,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.current_credits_list_index += 14; if (game.current_credits_list_index >= (int)game.patrons.size()) @@ -1229,7 +1229,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.current_credits_list_index = 0; game.createmenu("mainmenu"); map.nexttowercolour(); @@ -1240,7 +1240,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //next page - music.playef(11, 10); + music.playef(11); game.current_credits_list_index += 9; if (game.current_credits_list_index >= (int)game.githubfriends.size()) @@ -1260,7 +1260,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.current_credits_list_index = 0; game.createmenu("mainmenu"); map.nexttowercolour(); @@ -1271,14 +1271,14 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //first page - music.playef(11, 10); + music.playef(11); game.createmenu("credits"); map.nexttowercolour(); } else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); music.niceplay(6); @@ -1305,7 +1305,7 @@ SDL_assert(0 && "Remove open level dir"); else { //go to a menu! - music.playef(11, 10); + music.playef(11); game.loadsummary(); //Prepare save slots to display game.createmenu("continue"); map.settowercolour(3); @@ -1314,21 +1314,21 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 1) { //play modes - music.playef(11, 10); + music.playef(11); game.createmenu("playmodes"); map.nexttowercolour(); } else if (game.currentmenuoption == 2) { //newgame - music.playef(11, 10); + music.playef(11); game.createmenu("newgamewarning"); map.nexttowercolour(); } else if (game.currentmenuoption == 3) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -1355,7 +1355,7 @@ SDL_assert(0 && "Remove open level dir"); else { //go to a menu! - music.playef(11, 10); + music.playef(11); game.loadsummary(); //Prepare save slots to display game.createmenu("continue"); map.settowercolour(3); @@ -1368,27 +1368,27 @@ SDL_assert(0 && "Remove open level dir"); graphics.fademode = 2; }else{ //Can't do yet! play sad sound - music.playef(2, 10); + music.playef(2); } } else if (game.currentmenuoption == 2) { //play modes - music.playef(11, 10); + music.playef(11); game.createmenu("playmodes"); map.nexttowercolour(); } else if (game.currentmenuoption == 3) { //newgame - music.playef(11, 10); + music.playef(11); game.createmenu("newgamewarning"); map.nexttowercolour(); } else if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("mainmenu"); map.nexttowercolour(); } @@ -1406,7 +1406,7 @@ SDL_assert(0 && "Remove open level dir"); else { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1417,7 +1417,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { game.controllerSensitivity++; - music.playef(11, 10); + music.playef(11); if(game.controllerSensitivity > 4) { game.controllerSensitivity = 0; @@ -1426,7 +1426,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 4) { - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -1452,7 +1452,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("options"); //Add extra menu for mmmmmm mod @@ -1476,7 +1476,7 @@ SDL_assert(0 && "Remove open level dir"); else { //yep - music.playef(23, 10); + music.playef(23); game.deletequick(); game.deletetele(); game.deletestats(); @@ -1490,26 +1490,26 @@ SDL_assert(0 && "Remove open level dir"); { if (game.currentmenuoption == 0 && game.slowdown == 30 && !map.invincibility) //go to the time trial menu { - music.playef(11, 10); + music.playef(11); game.createmenu("timetrials"); map.nexttowercolour(); } else if (game.currentmenuoption == 1 && game.unlock[16]) { //intermission mode menu - music.playef(11, 10); + music.playef(11); game.createmenu("intermissionmenu"); map.nexttowercolour(); } else if (game.currentmenuoption == 2 && game.unlock[17] && game.slowdown == 30 && !map.invincibility) //start a game in no death mode { - music.playef(11, 10); + music.playef(11); game.createmenu("startnodeathmode"); map.nexttowercolour(); } else if (game.currentmenuoption == 3 && game.unlock[18]) //enable/disable flip mode { - music.playef(18, 10); + music.playef(18); game.screenshake = 10; game.flashlight = 5; graphics.setflipmode = !graphics.setflipmode; @@ -1518,14 +1518,14 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } else { //Can't do yet! play sad sound - music.playef(2, 10); + music.playef(2); } } else if (game.currentmenuname == "startnodeathmode") @@ -1543,7 +1543,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 2) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1563,7 +1563,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 2) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1572,14 +1572,14 @@ SDL_assert(0 && "Remove open level dir"); { if (game.currentmenuoption == 0) { - music.playef(11, 10); + music.playef(11); music.play(6); game.createmenu("playint1"); map.nexttowercolour(); } else if (game.currentmenuoption == 1) { - music.playef(11, 10); + music.playef(11); music.play(6); game.createmenu("playint2"); map.nexttowercolour(); @@ -1587,7 +1587,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 2) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1617,7 +1617,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1647,7 +1647,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 4) { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1655,7 +1655,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuname == "gameover2") { //back - music.playef(11, 10); + music.playef(11); music.play(6); game.createmenu("mainmenu"); map.nexttowercolour(); @@ -1663,7 +1663,7 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuname == "unlocktimetrials" || game.currentmenuname == "unlocktimetrial") { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1671,7 +1671,7 @@ SDL_assert(0 && "Remove open level dir"); || game.currentmenuname == "unlockflipmode") { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -1710,14 +1710,14 @@ SDL_assert(0 && "Remove open level dir"); else if (game.currentmenuoption == 6) //go to the time trial menu { //back - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } else { //Can't do yet! play sad sound - music.playef(2, 10); + music.playef(2); } } else if (game.currentmenuname == "timetrialcomplete3") @@ -1725,7 +1725,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { //back - music.playef(11, 10); + music.playef(11); music.play(6); game.createmenu("play"); map.nexttowercolour(); @@ -1770,7 +1770,7 @@ SDL_assert(0 && "Remove open level dir"); if (game.currentmenuoption == 0) { music.play(6); - music.playef(11, 10); + music.playef(11); game.createmenu("play"); map.nexttowercolour(); } @@ -2224,7 +2224,7 @@ void gameinput() game.gravitycontrol = 1; obj.entities[ie].vy = -4; obj.entities[ie].ay = -3; - music.playef(0, 10); + music.playef(0); game.jumppressed = 0; game.totalflips++; } @@ -2233,7 +2233,7 @@ void gameinput() game.gravitycontrol = 0; obj.entities[ie].vy = 4; obj.entities[ie].ay = 3; - music.playef(1, 10); + music.playef(1); game.jumppressed = 0; game.totalflips++; } @@ -2391,7 +2391,7 @@ void mapinput() { game.flashlight = 5; game.screenshake = 10; - music.playef(18, 10); + music.playef(18); game.gamesaved = true; game.savetime = game.timestring(); diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 33aa7236..085a4d8f 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -27,11 +27,11 @@ void titlelogic() } else if (game.menudest == "gameover2") { - music.playef(11, 10); + music.playef(11); } else if (game.menudest == "timetrialcomplete3") { - music.playef(3, 10); + music.playef(3); } game.createmenu(game.menudest); } @@ -120,7 +120,7 @@ void gamecompletelogic2() map.colstate = 10; game.gamestate = 1; graphics.fademode = 4; - music.playef(18, 10); + music.playef(18); game.createmenu("gamecompletecontinue"); map.nexttowercolour(); } @@ -310,9 +310,9 @@ void towerlogic() { game.hascontrol = false; } - if(game.timetrialcountdown == 120) music.playef(21, 10); - if(game.timetrialcountdown == 90) music.playef(21, 10); - if(game.timetrialcountdown == 60) music.playef(21, 10); + if(game.timetrialcountdown == 120) music.playef(21); + if(game.timetrialcountdown == 90) music.playef(21); + if(game.timetrialcountdown == 60) music.playef(21); if (game.timetrialcountdown == 30) { switch(game.timetriallevel) @@ -336,7 +336,7 @@ void towerlogic() music.play(15); break; } - music.playef(22, 10); + music.playef(22); } } @@ -351,7 +351,7 @@ void towerlogic() { obj.entities[i].tile = 144; } - music.playef(2, 10); + music.playef(2); } } } @@ -549,7 +549,7 @@ void gamelogic() //change player to sad int i = obj.getplayer(); obj.entities[i].tile = 144; - music.playef(2, 10); + music.playef(2); } if (obj.upset > 301) obj.upset = 301; } @@ -639,7 +639,7 @@ void gamelogic() game.swndelay = 0; if (game.swntimer >= game.swnrecord) { - if (game.swnmessage == 0) music.playef(25, 10); + if (game.swnmessage == 0) music.playef(25); game.swnmessage = 1; game.swnrecord = game.swntimer; } @@ -765,7 +765,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav5"); game.swnbestrank = 1; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } else if (game.swntimer >= 300 && game.swnrank == 1) @@ -776,7 +776,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav10"); game.swnbestrank = 2; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } else if (game.swntimer >= 450 && game.swnrank == 2) @@ -787,7 +787,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav15"); game.swnbestrank = 3; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } else if (game.swntimer >= 600 && game.swnrank == 3) @@ -798,7 +798,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav20"); game.swnbestrank = 4; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } else if (game.swntimer >= 900 && game.swnrank == 4) @@ -809,7 +809,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav30"); game.swnbestrank = 5; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } else if (game.swntimer >= 1800 && game.swnrank == 5) @@ -820,7 +820,7 @@ void gamelogic() NETWORK_unlockAchievement("vvvvvvsupgrav60"); game.swnbestrank = 6; game.swnmessage = 2+30; - music.playef(26, 10); + music.playef(26); } } @@ -904,9 +904,9 @@ void gamelogic() { game.hascontrol = false; } - if(game.timetrialcountdown == 120) music.playef(21, 10); - if(game.timetrialcountdown == 90) music.playef(21, 10); - if(game.timetrialcountdown == 60) music.playef(21, 10); + if(game.timetrialcountdown == 120) music.playef(21); + if(game.timetrialcountdown == 90) music.playef(21); + if(game.timetrialcountdown == 60) music.playef(21); if (game.timetrialcountdown == 30) { switch(game.timetriallevel) @@ -930,7 +930,7 @@ void gamelogic() music.play(15); break; } - music.playef(22, 10); + music.playef(22); } } @@ -945,7 +945,7 @@ void gamelogic() { obj.entities[i].tile = 144; } - music.playef(2, 10); + music.playef(2); } } } diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 448212b8..93dc9994 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -460,7 +460,7 @@ void musicclass::changemusicarea(int x, int y) } } -void musicclass::playef(int t, int offset) +void musicclass::playef(int t) { // efchannel[currentefchan] = efchan[t].play(offset); // currentefchan++; diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h index 85585881..4e74a389 100644 --- a/desktop_version/src/Music.h +++ b/desktop_version/src/Music.h @@ -35,7 +35,7 @@ public: //public var nicefade:int, nicechange:int; - void playef(int t, int offset = 0); + void playef(int t); std::vector soundTracks; std::vector musicTracks; diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index cdf2cb9e..850a06af 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -240,7 +240,7 @@ void scriptclass::run() } if (words[0] == "playef") { - music.playef(ss_toi(words[1]), ss_toi(words[2])); + music.playef(ss_toi(words[1])); } if (words[0] == "play") { @@ -1200,39 +1200,39 @@ void scriptclass::run() { if (words[1] == "player") { - music.playef(11, 10); + music.playef(11); } else if (words[1] == "cyan") { - music.playef(11, 10); + music.playef(11); } else if (words[1] == "red") { - music.playef(16, 10); + music.playef(16); } else if (words[1] == "green") { - music.playef(12, 10); + music.playef(12); } else if (words[1] == "yellow") { - music.playef(14, 10); + music.playef(14); } else if (words[1] == "blue") { - music.playef(13, 10); + music.playef(13); } else if (words[1] == "purple") { - music.playef(15, 10); + music.playef(15); } else if (words[1] == "cry") { - music.playef(2, 10); + music.playef(2); } else if (words[1] == "terminal") { - music.playef(20, 10); + music.playef(20); } } else if (words[0] == "blackout") @@ -1880,7 +1880,7 @@ void scriptclass::run() { //music.silencedasmusik(); music.haltdasmusik(); - music.playef(3,10); + music.playef(3); game.trinkets++; obj.collect[ss_toi(words[1])] = 1; @@ -1916,7 +1916,7 @@ void scriptclass::run() } else if (words[0] == "foundlab") { - music.playef(3,10); + music.playef(3); graphics.textboxremovefast(); diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index 42a0cc24..7926e3cb 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -4059,7 +4059,7 @@ void editorinput() } else if (game.currentmenuoption == 4) { - music.playef(11, 10); + music.playef(11); game.createmenu("ed_settings"); map.nexttowercolour(); } @@ -4069,14 +4069,14 @@ void editorinput() if (game.currentmenuoption == 0) { //Change level description stuff - music.playef(11, 10); + music.playef(11); game.createmenu("ed_desc"); map.nexttowercolour(); } else if (game.currentmenuoption == 1) { //Enter script editormode - music.playef(11, 10); + music.playef(11); ed.scripteditmod=true; ed.clearscriptbuffer(); key.enabletextentry(); @@ -4090,7 +4090,7 @@ void editorinput() } else if (game.currentmenuoption == 2) { - music.playef(11, 10); + music.playef(11); game.createmenu("ed_music"); map.nexttowercolour(); if(ed.levmusic>0) music.play(ed.levmusic); @@ -4127,7 +4127,7 @@ void editorinput() } else if (game.currentmenuoption == 5) { - music.playef(11, 10); + music.playef(11); game.createmenu("ed_quit"); map.nexttowercolour(); } @@ -4149,11 +4149,11 @@ void editorinput() { music.haltdasmusik(); } - music.playef(11, 10); + music.playef(11); } else if (game.currentmenuoption == 1) { - music.playef(11, 10); + music.playef(11); music.fadeout(); game.createmenu("ed_settings"); map.nexttowercolour(); @@ -4181,14 +4181,14 @@ void editorinput() else if (game.currentmenuoption == 1) { //Quit without saving - music.playef(11, 10); + music.playef(11); music.fadeout(); graphics.fademode = 2; } else if (game.currentmenuoption == 2) { //Go back to editor - music.playef(11, 10); + music.playef(11); game.createmenu("ed_settings"); map.nexttowercolour(); }