Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +03:00
Code Issues Packages Projects 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
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].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)