G_DoCompleted: Refactor in anticipation of new Challenge conditions

- Stop sounds first, as before.
- Do most player updates before M_UpdateUnlockablesAndExtraEmblems is called
    - Allows us to make Challenges dependent on end-of-round Standings
- Then Challenges and gamedata...
- Then, group all important game state updates together.
- THEN, finally assign PF_NOCONTEST when exitlevel occours.
    - Prevents No Contest-based Challenges from firing cheesily
- Finally, Intermission-related material (also as before).

src/g_game.c

@@ -4022,48 +4022,21 @@ static void G_DoCompleted(void)
 {
 	INT32 i;
 
-	if (modeattacking && pausedelay)
-		pausedelay = 0;
-
 	// We do this here so Challenges-related sounds aren't insta-killed
 	S_StopSounds();
 
-	if (legitimateexit && !demo.playback && !mapreset) // (yes you're allowed to unlock stuff this way when the game is modified)
+	// First, loop over all players to:
-	{
+	// - fake bot results
-		if (gametype != GT_TUTORIAL)
+	// - set client power add
-		{
+	// - grand prix updates (for those who have finished)
-			UINT8 roundtype = GDGT_CUSTOM;
+	//    - for bots
-
+	//        - set up difficulty increase (if applicable)
-			if (gametype == GT_RACE)
+	//    - for humans
-				roundtype = GDGT_RACE;
+	//        - update Rings
-			else if (gametype == GT_BATTLE)
+	//        - award Lives
-				roundtype = (battleprisons ? GDGT_PRISONS : GDGT_BATTLE);
+	//        - update over-all GP rank
-			else if (gametype == GT_SPECIAL || gametype == GT_VERSUS)
+	// - wipe some level-only player struct data
-				roundtype = GDGT_SPECIAL;
+	// (The common thread is it needs to be done before Challenges updates.)
-
-			gamedata->roundsplayed[roundtype]++;
-		}
-		gamedata->pendingkeyrounds++;
-
-		// Done before forced addition of PF_NOCONTEST to make UCRP_NOCONTEST harder to achieve
-		M_UpdateUnlockablesAndExtraEmblems(true, true);
-		gamedata->deferredsave = true;
-	}
-
-	if (gamedata->deferredsave)
-		G_SaveGameData();
-
-	legitimateexit = false;
-
-	gameaction = ga_nothing;
-
-	if (metalplayback)
-		G_StopMetalDemo();
-	if (metalrecording)
-		G_StopMetalRecording(false);
-
-	G_SetGamestate(GS_NULL);
-	wipegamestate = GS_NULL;
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -4074,8 +4047,7 @@ static void G_DoCompleted(void)
 
 		player_t *const player = &players[i];
 
-		// Exitlevel shouldn't get you the points
+		if ((player->exiting == 0) && (player->pflags & PF_NOCONTEST) == 0)
-		if (player->exiting == false && (player->pflags & PF_NOCONTEST) == 0)
 		{
 			clientPowerAdd[i] = 0;
 
@@ -4083,13 +4055,9 @@ static void G_DoCompleted(void)
 			{
 				K_FakeBotResults(player);
 			}
-			else
-			{
-				player->pflags |= PF_NOCONTEST;
-			}
 		}
 
-		if (grandprixinfo.gp == true && grandprixinfo.wonround == true && player->exiting == true)
+		if (grandprixinfo.gp == true && grandprixinfo.wonround == true && player->exiting)
 		{
 			if (player->bot == true)
 			{
@@ -4125,11 +4093,77 @@ static void G_DoCompleted(void)
 		G_PlayerFinishLevel(i); // take away cards and stuff
 	}
 
-	if (automapactive)
+	// Then, do gamedata-relevant material.
-		AM_Stop();
+	// This has to be done second because some Challenges
+	// are dependent on round standings.
+	if (legitimateexit && !demo.playback && !mapreset)
+	{
+		if (gametype != GT_TUTORIAL)
+		{
+			UINT8 roundtype = GDGT_CUSTOM;
 
-	prevmap = (INT16)(gamemap-1);
+			if (gametype == GT_RACE)
+				roundtype = GDGT_RACE;
+			else if (gametype == GT_BATTLE)
+				roundtype = (battleprisons ? GDGT_PRISONS : GDGT_BATTLE);
+			else if (gametype == GT_SPECIAL || gametype == GT_VERSUS)
+				roundtype = GDGT_SPECIAL;
 
+			gamedata->roundsplayed[roundtype]++;
+		}
+		gamedata->pendingkeyrounds++;
+
+		M_UpdateUnlockablesAndExtraEmblems(true, true);
+		gamedata->deferredsave = true;
+	}
+
+	// This isn't in the above block because other
+	// mechanisms can queue up a gamedata save.
+	if (gamedata->deferredsave)
+		G_SaveGameData();
+
+	// Then, update some important game state.
+	{
+		legitimateexit = false;
+
+		if (modeattacking && pausedelay)
+			pausedelay = 0;
+
+		gameaction = ga_nothing;
+
+		if (metalplayback)
+			G_StopMetalDemo();
+		if (metalrecording)
+			G_StopMetalRecording(false);
+
+		if (automapactive)
+			AM_Stop();
+
+		G_SetGamestate(GS_NULL);
+		wipegamestate = GS_NULL;
+
+		prevmap = (INT16)(gamemap-1);
+	}
+
+	// Finally, if you're not exiting, guarantee NO CONTEST.
+	// We do this seperately from the loop above Challenges,
+	// so NOCONTEST-related Challenges don't fire on exitlevel.
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (playeringame[i] == false)
+		{
+			continue;
+		}
+
+		if (players[i].exiting || (players[i].pflags & PF_NOCONTEST))
+		{
+			continue;
+		}
+
+		players[i].pflags |= PF_NOCONTEST;
+	}
+
+	// And lastly, everything in anticipation for Intermission/level change.
 	if (!demo.playback)
 	{
 		// Set up power level gametype scrambles

src/k_grandprix.c

@@ -763,9 +763,15 @@ void K_FakeBotResults(player_t *bot)
 		}
 	}
 
-	if (besttime == UINT32_MAX // No one finished, so you don't finish either.
+	if (besttime == UINT32_MAX) // No one finished, so you don't finish either.
-	|| bot->distancetofinish >= worstdist) // Last place, you aren't going to finish.
 	{
+		// We don't apply PF_NOCONTEST in the exitlevel case - that's done for all players in G_DoCompleted.
+		return;
+	}
+
+	if (bot->distancetofinish >= worstdist) // Last place, you aren't going to finish.
+	{
+		// This was a successful murder!
 		bot->pflags |= PF_NOCONTEST;
 		return;
 	}