Commits

Torr_Samaho  committed 4c59a51

[Dusk] Fixed: Players could get medals from spawn telefrags.

  • Participants
  • Parent commits 401f0c1

Comments (0)

Files changed (2)

File docs/Skulltag Version History.txt

 -	- Fixed: When a non-spectator player disconnected his running CLIENTSIDE scripts were not terminated. [Torr Samaho]
 -	- Fixed: When a map reset was done while a PowerTimeFreezer was in effect, the sound was not resumed after the reset. [Torr Samaho]
 -	- Fixed: Grenade explosion sound was not unlimited. [Dusk]
+-	- Fixed: Players could get medals from spawn telefrags. [Dusk]
 !	- Changed F12 to allow spectators full spying, with the exception of during LMS if it's disabled. [Eruanna]
 !	- Changed F12 to allow full demo spying. [Eruanna]
 !	- Players aren't forced to spectate after a "changemap" map change on a server with a join password anymore. [Torr Samaho]

File src/medal.cpp

 // Has the first frag medal been awarded this round?
 static	bool			g_bFirstFragAwarded;
 
+// [Dusk] Need this from p_interaction.cpp for spawn telefrag checking
+extern FName MeansOfDeath;
+
 //*****************************************************************************
 //	CONSOLE VARIABLES
 
 
 	// Check for domination and first frag medals.
 	if ( PLAYER_IsValidPlayerWithMo ( ulSourcePlayer ) &&
-		( players[ulSourcePlayer].mo->IsTeammate( players[ulPlayer].mo ) == false ))
+		( players[ulSourcePlayer].mo->IsTeammate( players[ulPlayer].mo ) == false ) &&
+		// [Dusk] As players do not get frags for spawn telefrags, they shouldn't get medals for that either
+		( MeansOfDeath != NAME_SpawnTelefrag ))
 	{
 		players[ulSourcePlayer].ulFragsWithoutDeath++;
 		players[ulSourcePlayer].ulDeathsWithoutFrag = 0;