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

Don't allow setting Super Gravitron records in custom levels

Browse source 
Custom levels shouldn't affect main game save data, and Super Gravitron
records are no exception.

I also added MAKEANDPLAY ifdefs just to be safe.
This commit is contained in:
Misa 2021-05-03 19:19:22 -07:00 committed by Ethan Lee
parent 4e0484553d
commit a52547b60d
1 changed files with 75 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
desktop_version/src/Logic.cpp
View file

@ -420,7 +420,8 @@ void gamelogic(void)
game.swnstate3 = 0; game.swnstate3 = 0;
game.swnstate4 = 0; game.swnstate4 = 0;
game.swndelay = 0; game.swndelay = 0;
if (game.swntimer >= game.swnrecord) #ifndef MAKEANDPLAY
if (game.swntimer >= game.swnrecord && !map.custommode)
{ {
game.swnrecord = game.swntimer; game.swnrecord = game.swntimer;
if (game.swnmessage == 0) if (game.swnmessage == 0)
@ -430,6 +431,7 @@ void gamelogic(void)
} }
game.swnmessage = 1; game.swnmessage = 1;
} }
#endif
} }
} }
@ -546,74 +548,82 @@ void gamelogic(void)
else if(game.swngame==1) //super gravitron game else if(game.swngame==1) //super gravitron game
{ {
game.swntimer += 1; game.swntimer += 1;
if (game.swntimer > game.swnrecord) game.swnrecord = game.swntimer; #ifndef MAKEANDPLAY
if (!map.custommode)
{
if (game.swntimer > game.swnrecord)
{
game.swnrecord = game.swntimer;
}
if (game.swntimer >= 150 && game.swnrank == 0) if (game.swntimer >= 150 && game.swnrank == 0)
{
game.swnrank = 1;
if (game.swnbestrank < 1)
{ {
game.unlockAchievement("vvvvvvsupgrav5"); game.swnrank = 1;
game.swnbestrank = 1; if (game.swnbestrank < 1)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav5");
} game.swnbestrank = 1;
} game.swnmessage = 2+30;
else if (game.swntimer >= 300 && game.swnrank == 1) music.playef(26);
{ }
game.swnrank = 2; }
if (game.swnbestrank < 2) else if (game.swntimer >= 300 && game.swnrank == 1)
{ {
game.unlockAchievement("vvvvvvsupgrav10"); game.swnrank = 2;
game.swnbestrank = 2; if (game.swnbestrank < 2)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav10");
} game.swnbestrank = 2;
} game.swnmessage = 2+30;
else if (game.swntimer >= 450 && game.swnrank == 2) music.playef(26);
{ }
game.swnrank = 3; }
if (game.swnbestrank < 3) else if (game.swntimer >= 450 && game.swnrank == 2)
{ {
game.unlockAchievement("vvvvvvsupgrav15"); game.swnrank = 3;
game.swnbestrank = 3; if (game.swnbestrank < 3)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav15");
} game.swnbestrank = 3;
} game.swnmessage = 2+30;
else if (game.swntimer >= 600 && game.swnrank == 3) music.playef(26);
{ }
game.swnrank = 4; }
if (game.swnbestrank < 4) else if (game.swntimer >= 600 && game.swnrank == 3)
{ {
game.unlockAchievement("vvvvvvsupgrav20"); game.swnrank = 4;
game.swnbestrank = 4; if (game.swnbestrank < 4)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav20");
} game.swnbestrank = 4;
} game.swnmessage = 2+30;
else if (game.swntimer >= 900 && game.swnrank == 4) music.playef(26);
{ }
game.swnrank = 5; }
if (game.swnbestrank < 5) else if (game.swntimer >= 900 && game.swnrank == 4)
{ {
game.unlockAchievement("vvvvvvsupgrav30"); game.swnrank = 5;
game.swnbestrank = 5; if (game.swnbestrank < 5)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav30");
} game.swnbestrank = 5;
} game.swnmessage = 2+30;
else if (game.swntimer >= 1800 && game.swnrank == 5) music.playef(26);
{ }
game.swnrank = 6; }
if (game.swnbestrank < 6) else if (game.swntimer >= 1800 && game.swnrank == 5)
{ {
game.unlockAchievement("vvvvvvsupgrav60"); game.swnrank = 6;
game.swnbestrank = 6; if (game.swnbestrank < 6)
game.swnmessage = 2+30; {
music.playef(26); game.unlockAchievement("vvvvvvsupgrav60");
game.swnbestrank = 6;
game.swnmessage = 2+30;
music.playef(26);
}
} }
} }
#endif
obj.generateswnwave(1); obj.generateswnwave(1);