mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Remove unused argument from musicclass::playef()

Browse source 
Apparently the 'offset' argument did something in the 1.x Flash
versions, but now it does nothing.
This commit is contained in:
Misa 2020-04-01 16:36:35 -07:00 committed by Ethan Lee
parent 253d44ac0b
commit 16c3966ace
8 changed files with 257 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
desktop_version/src/Entity.cpp
View file

@ -3116,7 +3116,7 @@ bool entityclass::updateentities( int i )
entities[i].state = 2; entities[i].state = 2;
entities[i].onentity = 0; entities[i].onentity = 0;
music.playef(7,10); music.playef(7);
} }
else if (entities[i].state == 2) else if (entities[i].state == 2)
{ {
@ -3164,7 +3164,7 @@ bool entityclass::updateentities( int i )
entities[i].life = 4; entities[i].life = 4;
entities[i].state = 2; entities[i].state = 2;
entities[i].onentity = 0; 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)) { /*}else if (entities[j].vy <= -0.5 && (entities[j].yp>=entities[i].yp+2)) {
entities[i].life = 4; entities[i].life = 4;
entities[i].state = 2; entities[i].onentity = 0; entities[i].state = 2; entities[i].onentity = 0;
@ -3204,7 +3204,7 @@ bool entityclass::updateentities( int i )
if (entities[i].state == 1) if (entities[i].state == 1)
{ {
game.coins++; game.coins++;
music.playef(4,10); music.playef(4);
collect[entities[i].para] = 1; collect[entities[i].para] = 1;
entities[i].active = false; entities[i].active = false;
@ -3218,14 +3218,14 @@ bool entityclass::updateentities( int i )
if (game.intimetrial) if (game.intimetrial)
{ {
collect[entities[i].para] = 1; collect[entities[i].para] = 1;
music.playef(25,10); music.playef(25);
} }
else else
{ {
game.state = 1000; game.state = 1000;
//music.haltdasmusik(); //music.haltdasmusik();
if(music.currentsong!=-1) music.silencedasmusik(); if(music.currentsong!=-1) music.silencedasmusik();
music.playef(3,10); music.playef(3);
collect[entities[i].para] = 1; collect[entities[i].para] = 1;
if (game.trinkets > game.stat_trinkets) if (game.trinkets > game.stat_trinkets)
{ {
@ -3252,7 +3252,7 @@ bool entityclass::updateentities( int i )
entities[i].colour = 5; entities[i].colour = 5;
entities[i].onentity = 0; entities[i].onentity = 0;
game.savepoint = entities[i].para; game.savepoint = entities[i].para;
music.playef(5,10); music.playef(5);
game.savex = entities[i].xp - 4; game.savex = entities[i].xp - 4;
@ -3293,7 +3293,7 @@ bool entityclass::updateentities( int i )
entities[i].state = 2; entities[i].state = 2;
music.playef(8,10); music.playef(8);
game.gravitycontrol = (game.gravitycontrol + 1) % 2; game.gravitycontrol = (game.gravitycontrol + 1) % 2;
game.totalflips++; game.totalflips++;
temp = getplayer(); temp = getplayer();
@ -3672,7 +3672,7 @@ bool entityclass::updateentities( int i )
{ {
entities[i].colour = 5; entities[i].colour = 5;
entities[i].onentity = 0; entities[i].onentity = 0;
music.playef(17,10); music.playef(17);
entities[i].state = 0; entities[i].state = 0;
} }
@ -3840,14 +3840,14 @@ bool entityclass::updateentities( int i )
if (game.intimetrial) if (game.intimetrial)
{ {
customcollect[entities[i].para] = 1; customcollect[entities[i].para] = 1;
music.playef(27,10); music.playef(27);
} }
else else
{ {
game.state = 1010; game.state = 1010;
//music.haltdasmusik(); //music.haltdasmusik();
if(music.currentsong!=-1) music.silencedasmusik(); if(music.currentsong!=-1) music.silencedasmusik();
music.playef(27,10); music.playef(27);
customcollect[entities[i].para] = 1; customcollect[entities[i].para] = 1;
} }
@ -3860,7 +3860,7 @@ bool entityclass::updateentities( int i )
//if inactive, activate! //if inactive, activate!
if (entities[i].tile == 1) if (entities[i].tile == 1)
{ {
music.playef(18, 10); music.playef(18);
entities[i].onentity = 0; entities[i].onentity = 0;
entities[i].tile = 2; entities[i].tile = 2;
entities[i].colour = 101; entities[i].colour = 101;
@ -5290,7 +5290,7 @@ void entityclass::entitycollisioncheck()
{ {
if (entityhlinecollide(i, j)) if (entityhlinecollide(i, j))
{ {
music.playef(8,10); music.playef(8);
game.gravitycontrol = (game.gravitycontrol + 1) % 2; game.gravitycontrol = (game.gravitycontrol + 1) % 2;
game.totalflips++; game.totalflips++;
if (game.gravitycontrol == 0) if (game.gravitycontrol == 0)

114
desktop_version/src/Game.cpp
View file

@ -915,7 +915,7 @@ void Game::updatestate()
if(obj.entities[obj.getplayer()].tile == 0) if(obj.entities[obj.getplayer()].tile == 0)
{ {
obj.entities[obj.getplayer()].tile = 144; obj.entities[obj.getplayer()].tile = 144;
music.playef(2, 10); music.playef(2);
} }
state = 0; state = 0;
break; break;
@ -1293,7 +1293,7 @@ void Game::updatestate()
break; break;
case 50: case 50:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Help! Can anyone hear", 35, 15, 255, 134, 255); graphics.createtextbox("Help! Can anyone hear", 35, 15, 255, 134, 255);
graphics.addline("this message?"); graphics.addline("this message?");
graphics.textboxtimer(60); graphics.textboxtimer(60);
@ -1301,7 +1301,7 @@ void Game::updatestate()
statedelay = 100; statedelay = 100;
break; break;
case 51: case 51:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Verdigris? Are you out", 30, 12, 255, 134, 255); graphics.createtextbox("Verdigris? Are you out", 30, 12, 255, 134, 255);
graphics.addline("there? Are you ok?"); graphics.addline("there? Are you ok?");
graphics.textboxtimer(60); graphics.textboxtimer(60);
@ -1309,7 +1309,7 @@ void Game::updatestate()
statedelay = 100; statedelay = 100;
break; break;
case 52: case 52:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Please help us! We've crashed", 5, 22, 255, 134, 255); graphics.createtextbox("Please help us! We've crashed", 5, 22, 255, 134, 255);
graphics.addline("and need assistance!"); graphics.addline("and need assistance!");
graphics.textboxtimer(60); graphics.textboxtimer(60);
@ -1317,14 +1317,14 @@ void Game::updatestate()
statedelay = 100; statedelay = 100;
break; break;
case 53: case 53:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Hello? Anyone out there?", 40, 15, 255, 134, 255); graphics.createtextbox("Hello? Anyone out there?", 40, 15, 255, 134, 255);
graphics.textboxtimer(60); graphics.textboxtimer(60);
state++; state++;
statedelay = 100; statedelay = 100;
break; break;
case 54: case 54:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("This is Doctor Violet from the", 5, 8, 255, 134, 255); graphics.createtextbox("This is Doctor Violet from the", 5, 8, 255, 134, 255);
graphics.addline("D.S.S. Souleye! Please respond!"); graphics.addline("D.S.S. Souleye! Please respond!");
graphics.textboxtimer(60); graphics.textboxtimer(60);
@ -1332,14 +1332,14 @@ void Game::updatestate()
statedelay = 100; statedelay = 100;
break; break;
case 55: case 55:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Please... Anyone...", 45, 14, 255, 134, 255); graphics.createtextbox("Please... Anyone...", 45, 14, 255, 134, 255);
graphics.textboxtimer(60); graphics.textboxtimer(60);
state++; state++;
statedelay = 100; statedelay = 100;
break; break;
case 56: case 56:
music.playef(15, 10); music.playef(15);
graphics.createtextbox("Please be alright, everyone...", 25, 18, 255, 134, 255); graphics.createtextbox("Please be alright, everyone...", 25, 18, 255, 134, 255);
graphics.textboxtimer(60); graphics.textboxtimer(60);
state=50; state=50;
@ -1423,7 +1423,7 @@ void Game::updatestate()
obj.removetrigger(85); obj.removetrigger(85);
//Init final stretch //Init final stretch
state++; state++;
music.playef(9, 10); music.playef(9);
music.play(2); music.play(2);
obj.flags[72] = 1; obj.flags[72] = 1;
@ -1516,7 +1516,7 @@ void Game::updatestate()
if (obj.entities[i].onroof > 0 && gravitycontrol == 1) if (obj.entities[i].onroof > 0 && gravitycontrol == 1)
{ {
gravitycontrol = 0; gravitycontrol = 0;
music.playef(1, 10); music.playef(1);
} }
if (obj.entities[i].onground > 0) 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); graphics.createtextbox("Captain! I've been so worried!", 60, 90, 164, 255, 164);
state++; state++;
music.playef(12, 10); music.playef(12);
} }
break; break;
case 104: case 104:
graphics.createtextbox("I'm glad you're ok!", 135, 152, 164, 164, 255); graphics.createtextbox("I'm glad you're ok!", 135, 152, 164, 164, 255);
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 106: case 106:
@ -1553,7 +1553,7 @@ void Game::updatestate()
graphics.addline("way out, but I keep going"); graphics.addline("way out, but I keep going");
graphics.addline("around in circles..."); graphics.addline("around in circles...");
state++; state++;
music.playef(2, 10); music.playef(2);
graphics.textboxactive(); graphics.textboxactive();
i = obj.getcompanion(); i = obj.getcompanion();
obj.entities[i].tile = 54; 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.createtextbox("Don't worry! I have a", 125, 152, 164, 164, 255);
graphics.addline("teleporter key!"); graphics.addline("teleporter key!");
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 110: case 110:
@ -1575,7 +1575,7 @@ void Game::updatestate()
obj.entities[i].state = 1; obj.entities[i].state = 1;
graphics.createtextbox("Follow me!", 185, 154, 164, 164, 255); graphics.createtextbox("Follow me!", 185, 154, 164, 164, 255);
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
} }
@ -1634,7 +1634,7 @@ void Game::updatestate()
if (obj.entities[i].onground > 0 && gravitycontrol == 0) if (obj.entities[i].onground > 0 && gravitycontrol == 0)
{ {
gravitycontrol = 1; gravitycontrol = 1;
music.playef(1, 10); music.playef(1);
} }
if (obj.entities[i].onroof > 0) 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); graphics.createtextbox("Captain! You're ok!", 60-10, 90-40, 255, 255, 134);
state++; state++;
music.playef(14, 10); music.playef(14);
break; break;
case 124: case 124:
graphics.createtextbox("I've found a teleporter, but", 60-20, 90 - 40, 255, 255, 134); 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..."); graphics.addline("I can't get it to go anywhere...");
state++; state++;
music.playef(2, 10); music.playef(2);
graphics.textboxactive(); graphics.textboxactive();
i = obj.getcompanion(); //obj.entities[i].tile = 66; obj.entities[i].state = 0; i = obj.getcompanion(); //obj.entities[i].tile = 66; obj.entities[i].state = 0;
break; break;
case 126: case 126:
graphics.createtextbox("I can help with that!", 125, 152-40, 164, 164, 255); graphics.createtextbox("I can help with that!", 125, 152-40, 164, 164, 255);
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 128: case 128:
graphics.createtextbox("I have the teleporter", 130, 152-35, 164, 164, 255); graphics.createtextbox("I have the teleporter", 130, 152-35, 164, 164, 255);
graphics.addline("codex for our ship!"); graphics.addline("codex for our ship!");
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 130: case 130:
graphics.createtextbox("Yey! Let's go home!", 60-30, 90-35, 255, 255, 134); graphics.createtextbox("Yey! Let's go home!", 60-30, 90-35, 255, 255, 134);
state++; state++;
music.playef(14, 10); music.playef(14);
graphics.textboxactive(); graphics.textboxactive();
i = obj.getcompanion(); i = obj.getcompanion();
obj.entities[i].tile = 6; obj.entities[i].tile = 6;
@ -1698,7 +1698,7 @@ void Game::updatestate()
case 200: case 200:
//Init final stretch //Init final stretch
state++; state++;
music.playef(9, 10); music.playef(9);
//music.play(2); //music.play(2);
obj.flags[72] = 1; obj.flags[72] = 1;
@ -2148,7 +2148,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 2501: case 2501:
//Activating a teleporter 2 //Activating a teleporter 2
@ -2157,7 +2157,7 @@ void Game::updatestate()
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
//we're done here! //we're done here!
music.playef(10, 10); music.playef(10);
break; break;
case 2502: case 2502:
//Activating a teleporter 2 //Activating a teleporter 2
@ -2220,7 +2220,7 @@ void Game::updatestate()
hascontrol = false; hascontrol = false;
graphics.createtextbox("Hello?", 125+24, 152-20, 164, 164, 255); graphics.createtextbox("Hello?", 125+24, 152-20, 164, 164, 255);
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 2512: case 2512:
@ -2228,7 +2228,7 @@ void Game::updatestate()
hascontrol = false; hascontrol = false;
graphics.createtextbox("Is anyone there?", 125+8, 152-24, 164, 164, 255); graphics.createtextbox("Is anyone there?", 125+8, 152-24, 164, 164, 255);
state++; state++;
music.playef(11, 10); music.playef(11);
graphics.textboxactive(); graphics.textboxactive();
break; break;
case 2514: case 2514:
@ -2247,28 +2247,28 @@ void Game::updatestate()
statedelay = 30; statedelay = 30;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 3001: case 3001:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3002: case 3002:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3003: case 3003:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3004: case 3004:
//Activating a teleporter 2 //Activating a teleporter 2
@ -2277,7 +2277,7 @@ void Game::updatestate()
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
//we're done here! //we're done here!
music.playef(10, 10); music.playef(10);
break; break;
case 3005: case 3005:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3291,28 +3291,28 @@ void Game::updatestate()
statedelay = 30; statedelay = 30;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 3512: case 3512:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3513: case 3513:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3514: case 3514:
//Activating a teleporter 2 //Activating a teleporter 2
state++; state++;
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
music.playef(9, 10); music.playef(9);
break; break;
case 3515: case 3515:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3326,7 +3326,7 @@ void Game::updatestate()
obj.entities[i].invis = true; obj.entities[i].invis = true;
//we're done here! //we're done here!
music.playef(10, 10); music.playef(10);
statedelay = 60; statedelay = 60;
break; break;
case 3516: case 3516:
@ -3388,7 +3388,7 @@ void Game::updatestate()
statedelay = 10; statedelay = 10;
flashlight = 5; flashlight = 5;
screenshake = 10; screenshake = 10;
music.playef(9, 10); music.playef(9);
break; break;
case 4001: case 4001:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3397,7 +3397,7 @@ void Game::updatestate()
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
//we're done here! //we're done here!
music.playef(10, 10); music.playef(10);
break; break;
case 4002: case 4002:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3431,7 +3431,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4011: case 4011:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3439,7 +3439,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4012: case 4012:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3520,7 +3520,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4021: case 4021:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3528,7 +3528,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4022: case 4022:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3596,7 +3596,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4031: case 4031:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3604,7 +3604,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4032: case 4032:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3672,7 +3672,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4041: case 4041:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3680,7 +3680,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4042: case 4042:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3753,7 +3753,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4051: case 4051:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3761,7 +3761,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4052: case 4052:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3834,7 +3834,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4061: case 4061:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3842,7 +3842,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4062: case 4062:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3913,7 +3913,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4071: case 4071:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3921,7 +3921,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4072: case 4072:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3989,7 +3989,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4081: case 4081:
//Activating a teleporter 2 //Activating a teleporter 2
@ -3997,7 +3997,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4082: case 4082:
//Activating a teleporter 2 //Activating a teleporter 2
@ -4065,7 +4065,7 @@ void Game::updatestate()
statedelay = 15; statedelay = 15;
flashlight = 5; flashlight = 5;
screenshake = 90; screenshake = 90;
music.playef(9, 10); music.playef(9);
break; break;
case 4091: case 4091:
//Activating a teleporter 2 //Activating a teleporter 2
@ -4073,7 +4073,7 @@ void Game::updatestate()
statedelay = 0; statedelay = 0;
flashlight = 5; flashlight = 5;
screenshake = 0; screenshake = 0;
music.playef(10, 10); music.playef(10);
break; break;
case 4092: case 4092:
//Activating a teleporter 2 //Activating a teleporter 2
@ -4799,7 +4799,7 @@ void Game::deathsequence()
gameoverdelay = 60; gameoverdelay = 60;
} }
deathcounts++; deathcounts++;
music.playef(2,10); music.playef(2);
obj.entities[i].invis = true; obj.entities[i].invis = true;
if (map.finalmode) if (map.finalmode)
{ {

288
desktop_version/src/Input.cpp
View file

File diff suppressed because it is too large Load diff

42
desktop_version/src/Logic.cpp
View file

@ -27,11 +27,11 @@ void titlelogic()
} }
else if (game.menudest == "gameover2") else if (game.menudest == "gameover2")
{ {
music.playef(11, 10); music.playef(11);
} }
else if (game.menudest == "timetrialcomplete3") else if (game.menudest == "timetrialcomplete3")
{ {
music.playef(3, 10); music.playef(3);
} }
game.createmenu(game.menudest); game.createmenu(game.menudest);
} }
@ -120,7 +120,7 @@ void gamecompletelogic2()
map.colstate = 10; map.colstate = 10;
game.gamestate = 1; game.gamestate = 1;
graphics.fademode = 4; graphics.fademode = 4;
music.playef(18, 10); music.playef(18);
game.createmenu("gamecompletecontinue"); game.createmenu("gamecompletecontinue");
map.nexttowercolour(); map.nexttowercolour();
} }
@ -310,9 +310,9 @@ void towerlogic()
{ {
game.hascontrol = false; game.hascontrol = false;
} }
if(game.timetrialcountdown == 120) music.playef(21, 10); if(game.timetrialcountdown == 120) music.playef(21);
if(game.timetrialcountdown == 90) music.playef(21, 10); if(game.timetrialcountdown == 90) music.playef(21);
if(game.timetrialcountdown == 60) music.playef(21, 10); if(game.timetrialcountdown == 60) music.playef(21);
if (game.timetrialcountdown == 30) if (game.timetrialcountdown == 30)
{ {
switch(game.timetriallevel) switch(game.timetriallevel)
@ -336,7 +336,7 @@ void towerlogic()
music.play(15); music.play(15);
break; break;
} }
music.playef(22, 10); music.playef(22);
} }
} }
@ -351,7 +351,7 @@ void towerlogic()
{ {
obj.entities[i].tile = 144; obj.entities[i].tile = 144;
} }
music.playef(2, 10); music.playef(2);
} }
} }
} }
@ -549,7 +549,7 @@ void gamelogic()
//change player to sad //change player to sad
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].tile = 144; obj.entities[i].tile = 144;
music.playef(2, 10); music.playef(2);
} }
if (obj.upset > 301) obj.upset = 301; if (obj.upset > 301) obj.upset = 301;
} }
@ -639,7 +639,7 @@ void gamelogic()
game.swndelay = 0; game.swndelay = 0;
if (game.swntimer >= game.swnrecord) if (game.swntimer >= game.swnrecord)
{ {
if (game.swnmessage == 0) music.playef(25, 10); if (game.swnmessage == 0) music.playef(25);
game.swnmessage = 1; game.swnmessage = 1;
game.swnrecord = game.swntimer; game.swnrecord = game.swntimer;
} }
@ -765,7 +765,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav5"); NETWORK_unlockAchievement("vvvvvvsupgrav5");
game.swnbestrank = 1; game.swnbestrank = 1;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
else if (game.swntimer >= 300 && game.swnrank == 1) else if (game.swntimer >= 300 && game.swnrank == 1)
@ -776,7 +776,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav10"); NETWORK_unlockAchievement("vvvvvvsupgrav10");
game.swnbestrank = 2; game.swnbestrank = 2;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
else if (game.swntimer >= 450 && game.swnrank == 2) else if (game.swntimer >= 450 && game.swnrank == 2)
@ -787,7 +787,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav15"); NETWORK_unlockAchievement("vvvvvvsupgrav15");
game.swnbestrank = 3; game.swnbestrank = 3;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
else if (game.swntimer >= 600 && game.swnrank == 3) else if (game.swntimer >= 600 && game.swnrank == 3)
@ -798,7 +798,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav20"); NETWORK_unlockAchievement("vvvvvvsupgrav20");
game.swnbestrank = 4; game.swnbestrank = 4;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
else if (game.swntimer >= 900 && game.swnrank == 4) else if (game.swntimer >= 900 && game.swnrank == 4)
@ -809,7 +809,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav30"); NETWORK_unlockAchievement("vvvvvvsupgrav30");
game.swnbestrank = 5; game.swnbestrank = 5;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
else if (game.swntimer >= 1800 && game.swnrank == 5) else if (game.swntimer >= 1800 && game.swnrank == 5)
@ -820,7 +820,7 @@ void gamelogic()
NETWORK_unlockAchievement("vvvvvvsupgrav60"); NETWORK_unlockAchievement("vvvvvvsupgrav60");
game.swnbestrank = 6; game.swnbestrank = 6;
game.swnmessage = 2+30; game.swnmessage = 2+30;
music.playef(26, 10); music.playef(26);
} }
} }
@ -904,9 +904,9 @@ void gamelogic()
{ {
game.hascontrol = false; game.hascontrol = false;
} }
if(game.timetrialcountdown == 120) music.playef(21, 10); if(game.timetrialcountdown == 120) music.playef(21);
if(game.timetrialcountdown == 90) music.playef(21, 10); if(game.timetrialcountdown == 90) music.playef(21);
if(game.timetrialcountdown == 60) music.playef(21, 10); if(game.timetrialcountdown == 60) music.playef(21);
if (game.timetrialcountdown == 30) if (game.timetrialcountdown == 30)
{ {
switch(game.timetriallevel) switch(game.timetriallevel)
@ -930,7 +930,7 @@ void gamelogic()
music.play(15); music.play(15);
break; break;
} }
music.playef(22, 10); music.playef(22);
} }
} }
@ -945,7 +945,7 @@ void gamelogic()
{ {
obj.entities[i].tile = 144; obj.entities[i].tile = 144;
} }
music.playef(2, 10); music.playef(2);
} }
} }
} }

2
desktop_version/src/Music.cpp
View file

@ -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); // efchannel[currentefchan] = efchan[t].play(offset);
// currentefchan++; // currentefchan++;

2
desktop_version/src/Music.h
View file

@ -35,7 +35,7 @@ public:
//public var nicefade:int, nicechange:int; //public var nicefade:int, nicechange:int;
void playef(int t, int offset = 0); void playef(int t);
std::vector<SoundTrack> soundTracks; std::vector<SoundTrack> soundTracks;
std::vector<MusicTrack> musicTracks; std::vector<MusicTrack> musicTracks;

24
desktop_version/src/Script.cpp
View file

@ -240,7 +240,7 @@ void scriptclass::run()
} }
if (words[0] == "playef") if (words[0] == "playef")
{ {
music.playef(ss_toi(words[1]), ss_toi(words[2])); music.playef(ss_toi(words[1]));
} }
if (words[0] == "play") if (words[0] == "play")
{ {
@ -1200,39 +1200,39 @@ void scriptclass::run()
{ {
if (words[1] == "player") if (words[1] == "player")
{ {
music.playef(11, 10); music.playef(11);
} }
else if (words[1] == "cyan") else if (words[1] == "cyan")
{ {
music.playef(11, 10); music.playef(11);
} }
else if (words[1] == "red") else if (words[1] == "red")
{ {
music.playef(16, 10); music.playef(16);
} }
else if (words[1] == "green") else if (words[1] == "green")
{ {
music.playef(12, 10); music.playef(12);
} }
else if (words[1] == "yellow") else if (words[1] == "yellow")
{ {
music.playef(14, 10); music.playef(14);
} }
else if (words[1] == "blue") else if (words[1] == "blue")
{ {
music.playef(13, 10); music.playef(13);
} }
else if (words[1] == "purple") else if (words[1] == "purple")
{ {
music.playef(15, 10); music.playef(15);
} }
else if (words[1] == "cry") else if (words[1] == "cry")
{ {
music.playef(2, 10); music.playef(2);
} }
else if (words[1] == "terminal") else if (words[1] == "terminal")
{ {
music.playef(20, 10); music.playef(20);
} }
} }
else if (words[0] == "blackout") else if (words[0] == "blackout")
@ -1880,7 +1880,7 @@ void scriptclass::run()
{ {
//music.silencedasmusik(); //music.silencedasmusik();
music.haltdasmusik(); music.haltdasmusik();
music.playef(3,10); music.playef(3);
game.trinkets++; game.trinkets++;
obj.collect[ss_toi(words[1])] = 1; obj.collect[ss_toi(words[1])] = 1;
@ -1916,7 +1916,7 @@ void scriptclass::run()
} }
else if (words[0] == "foundlab") else if (words[0] == "foundlab")
{ {
music.playef(3,10); music.playef(3);
graphics.textboxremovefast(); graphics.textboxremovefast();

18
desktop_version/src/editor.cpp
View file

@ -4059,7 +4059,7 @@ void editorinput()
} }
else if (game.currentmenuoption == 4) else if (game.currentmenuoption == 4)
{ {
music.playef(11, 10); music.playef(11);
game.createmenu("ed_settings"); game.createmenu("ed_settings");
map.nexttowercolour(); map.nexttowercolour();
} }
@ -4069,14 +4069,14 @@ void editorinput()
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
//Change level description stuff //Change level description stuff
music.playef(11, 10); music.playef(11);
game.createmenu("ed_desc"); game.createmenu("ed_desc");
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == 1) else if (game.currentmenuoption == 1)
{ {
//Enter script editormode //Enter script editormode
music.playef(11, 10); music.playef(11);
ed.scripteditmod=true; ed.scripteditmod=true;
ed.clearscriptbuffer(); ed.clearscriptbuffer();
key.enabletextentry(); key.enabletextentry();
@ -4090,7 +4090,7 @@ void editorinput()
} }
else if (game.currentmenuoption == 2) else if (game.currentmenuoption == 2)
{ {
music.playef(11, 10); music.playef(11);
game.createmenu("ed_music"); game.createmenu("ed_music");
map.nexttowercolour(); map.nexttowercolour();
if(ed.levmusic>0) music.play(ed.levmusic); if(ed.levmusic>0) music.play(ed.levmusic);
@ -4127,7 +4127,7 @@ void editorinput()
} }
else if (game.currentmenuoption == 5) else if (game.currentmenuoption == 5)
{ {
music.playef(11, 10); music.playef(11);
game.createmenu("ed_quit"); game.createmenu("ed_quit");
map.nexttowercolour(); map.nexttowercolour();
} }
@ -4149,11 +4149,11 @@ void editorinput()
{ {
music.haltdasmusik(); music.haltdasmusik();
} }
music.playef(11, 10); music.playef(11);
} }
else if (game.currentmenuoption == 1) else if (game.currentmenuoption == 1)
{ {
music.playef(11, 10); music.playef(11);
music.fadeout(); music.fadeout();
game.createmenu("ed_settings"); game.createmenu("ed_settings");
map.nexttowercolour(); map.nexttowercolour();
@ -4181,14 +4181,14 @@ void editorinput()
else if (game.currentmenuoption == 1) else if (game.currentmenuoption == 1)
{ {
//Quit without saving //Quit without saving
music.playef(11, 10); music.playef(11);
music.fadeout(); music.fadeout();
graphics.fademode = 2; graphics.fademode = 2;
} }
else if (game.currentmenuoption == 2) else if (game.currentmenuoption == 2)
{ {
//Go back to editor //Go back to editor
music.playef(11, 10); music.playef(11);
game.createmenu("ed_settings"); game.createmenu("ed_settings");
map.nexttowercolour(); map.nexttowercolour();
} }