Commits

Torr_Samaho  committed cbab171

[TIHan] Fixed: Console icon would stick on a player's head if the server missed the packet to remove the icon.

  • Participants
  • Parent commits 4740916

Comments (0)

Files changed (2)

File docs/Skulltag Version History.txt

 -	- Fixed: Players could get medals from spawn telefrags. [Dusk]
 -	- Fixed: Accuracy/Precision medals are now properly given when using the Rocket Launcher, Grenade Launcher, or BFG10K. [MP2E, Torr Samaho]
 -	- Fixed problems with the LAN broadcast under Linux. [Koromix]
+-	- Fixed: Console icon would stick on a player's head if the server missed the packet to remove the icon. [TIHan]
 !	- 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/sv_main.cpp

 
 	// [RC] This actually isn't necessarily true. By using a joystick, a player can both move and chat.
 	// I'm not going to change it though, because since they can move, they shouldn't be protected by the llama medal. Also, it'd confuse people.
-	if (( pPlayer->bChatting ) &&
-		(( pCmd->ucmd.buttons != 0 ) ||
+	// [WS] I agree with Rive's statement above and we need the same treatment for the console status.
+	if (( pCmd->ucmd.buttons != 0 ) ||
 		( pCmd->ucmd.forwardmove != 0 ) ||
 		( pCmd->ucmd.sidemove != 0 ) ||
-		( pCmd->ucmd.upmove != 0 )))
-	{
-		pPlayer->bChatting = false;
-		SERVERCOMMANDS_SetPlayerChatStatus( g_lCurrentClient );
+		( pCmd->ucmd.upmove != 0 ))
+	{
+		if ( pPlayer->bChatting )
+		{
+			pPlayer->bChatting = false;
+			SERVERCOMMANDS_SetPlayerChatStatus( g_lCurrentClient );
+		}
+
+		if ( pPlayer->bInConsole )
+		{
+			pPlayer->bInConsole = false;
+			SERVERCOMMANDS_SetPlayerConsoleStatus( g_lCurrentClient );
+		}
 	}
 
 	return ( false );