mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-26 06:28:30 +02:00
Code Issues Releases Wiki Activity

Always reset player when starting gamemode

Browse Source 
This fixes a bug where the player would always be facing right if they
were loading in for the first time. This essentially made them always
ignore the facing direction set in the save file if the facing direction
was leftwards.

The problem is facing direction only gets set in map.resetplayer(), but
if loading in for the first time, that path is never taken (unless you
are loading a main game quicksave that's inside a tower). The solution
is to always reset the player, even after creating them for the first
time.
This commit is contained in:
Misa 2021-08-05 12:41:04 -07:00 committed by Ethan Lee
parent 0dda1ca5e4
commit 6c6d347ccf
1 changed files with 19 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
desktop_version/src/Script.cpp
View File

@ -2654,10 +2654,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -2679,10 +2676,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
graphics.fademode = 4;
@ -2703,10 +2697,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
//a very special case for here needs to ensure that the tower is set correctly
@ -2783,10 +2774,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
graphics.fademode = 4;
@ -2807,10 +2795,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -2835,10 +2820,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -2866,10 +2848,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
music.play(11);
@ -2900,10 +2879,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -2934,10 +2910,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -2968,10 +2941,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3002,10 +2972,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3033,10 +3000,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3064,10 +3028,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3095,10 +3056,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3126,10 +3084,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3152,10 +3107,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
graphics.fademode = 4;
@ -3186,10 +3138,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
if(ed.levmusic>0){
@ -3222,10 +3171,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
@ -3266,10 +3212,7 @@ void scriptclass::startgamemode( int t )
{
obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed
}
else
{
map.resetplayer();
}
map.resetplayer();
map.gotoroom(game.saverx, game.savery);
map.initmapdata();
ed.generatecustomminimap();