desktop_version/src/Logic.cpp

@@ -470,7 +470,7 @@ void gamelogic()
 
                 game.gravitycontrol = game.savegc;
                 graphics.textboxremove();
-                map.resetplayer(true);
+                map.resetplayer();
             }
         }
     }

desktop_version/src/Map.cpp

@@ -802,11 +802,6 @@ void mapclass::showship()
 }
 
 void mapclass::resetplayer()
-{
-	resetplayer(false);
-}
-
-void mapclass::resetplayer(const bool player_died)
 {
 	bool was_in_tower = towermode;
 	if (game.roomx != game.saverx || game.roomy != game.savery)
@@ -826,15 +821,8 @@ void mapclass::resetplayer(const bool player_died)
 		obj.entities[i].yp = game.savey;
 		obj.entities[i].dir = game.savedir;
 		obj.entities[i].colour = 0;
-		if (player_died)
-		{
-			game.lifeseq = 10;
-			obj.entities[i].invis = true;
-		}
-		else
-		{
-			obj.entities[i].invis = false;
-		}
+		game.lifeseq = 10;
+		obj.entities[i].invis = true;
 		if (!game.glitchrunnermode)
 		{
 			obj.entities[i].size = 0;

desktop_version/src/Map.h

@@ -69,7 +69,6 @@ public:
 
     void showship();
 
-    void resetplayer(const bool player_died);
     void resetplayer();
 
     void warpto(int rx, int ry , int t, int tx, int ty);

desktop_version/src/Music.cpp

@@ -33,18 +33,11 @@ musicclass::musicclass()
 
 void musicclass::init()
 {
-	for (size_t i = 0; i < soundTracks.size(); ++i)
-	{
+	for (size_t i = 0; i < soundTracks.size(); ++i) {
 		Mix_FreeChunk(soundTracks[i].sound);
 	}
 	soundTracks.clear();
-
-	// Before we free all the music: stop playing music, else SDL2_mixer
-	// will call SDL_Delay() if we are fading, resulting in no-draw frames
-	Mix_HaltMusic();
-
-	for (size_t i = 0; i < musicTracks.size(); ++i)
-	{
+	for (size_t i = 0; i < musicTracks.size(); ++i) {
 		Mix_FreeMusic(musicTracks[i].m_music);
 	}
 	musicTracks.clear();

desktop_version/src/Script.cpp

@@ -2675,6 +2675,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -2700,6 +2701,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2740,6 +2742,7 @@ void scriptclass::startgamemode( int t )
 			map.cameramode = 0;
 			map.colsuperstate = 0;
 		}
+		game.lifeseq = 0;
 		graphics.fademode = 4;
 		break;
 	case 3:
@@ -2767,6 +2770,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2796,6 +2800,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2825,6 +2830,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2854,6 +2860,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2883,6 +2890,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2918,6 +2926,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -2943,6 +2952,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -2972,6 +2982,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3008,6 +3019,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		music.play(11);
@@ -3044,6 +3056,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3080,6 +3093,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3116,6 +3130,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3152,6 +3167,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3185,6 +3201,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3218,6 +3235,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3251,6 +3269,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3284,6 +3303,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3308,6 +3328,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		graphics.fademode = 4;
@@ -3344,6 +3365,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		if(ed.levmusic>0){
@@ -3382,6 +3404,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 
@@ -3428,6 +3451,7 @@ void scriptclass::startgamemode( int t )
 		{
 			map.resetplayer();
 		}
+		game.lifeseq = 0;
 		map.gotoroom(game.saverx, game.savery);
 		map.initmapdata();
 		ed.generatecustomminimap();