提交: 850eeed37215b9dfe3baeeb9d083d47c27a67f21 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修訂: 850eeed37215b9dfe3baeeb9d083d47c27a67f21 (tree)
• 時間: 2022-11-22 00:56:35
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

- The server skips sending a SVC2_SETPLAYERSTATUS command to the client that initially sent the CLC_STARTCHAT, CLC_ENTERCONSOLE, CLC_ENTERMENU, etc. command, as they already updated the status on their end.
- Added the helper function PLAYER_SetStatus.

Change Summary

• modified: src/botcommands.cpp
• modified: src/c_console.cpp
• modified: src/chat.cpp
• modified: src/cl_main.cpp
• modified: src/d_player.h
• modified: src/menu/menu.cpp
• modified: src/network.h
• modified: src/p_interaction.cpp
• modified: src/sv_main.cpp

差異

diff -r 2c280cd262f3 -r 850eeed37215 src/botcommands.cpp
--- a/src/botcommands.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/botcommands.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -2056,9 +2056,7 @@
 	}
 
 	// We can now get rid of the chat bubble above the bot's head.
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 }
 
 //*****************************************************************************
@@ -2071,9 +2069,7 @@
 	CChatFile	*pFile;
 
 	// We can now get rid of the chat bubble above the bot's head.
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 
 	sprintf( szSection, "%s", pBot->m_ScriptData.aszStringStack[pBot->m_ScriptData.lStringStackPosition - 1] );
 	pBot->PopStringStack( );
@@ -2129,9 +2125,7 @@
 	CChatFile	*pFile;
 
 	// We can now get rid of the chat bubble above the bot's head.
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 
 	sprintf( szSection, "%s", pBot->m_ScriptData.aszStringStack[pBot->m_ScriptData.lStringStackPosition - 1] );
 	pBot->PopStringStack( );
@@ -2180,18 +2174,14 @@
 //
 static void botcmd_BeginChatting( CSkullBot *pBot )
 {
-	pBot->GetPlayer( )->bChatting = true;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, true );
 }
 
 //*****************************************************************************
 //
 static void botcmd_StopChatting( CSkullBot *pBot )
 {
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 }
 
 //*****************************************************************************
@@ -2608,9 +2598,7 @@
 	CChatFile	*pFile;
 
 	// We can now get rid of the chat bubble above the bot's head.
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 
 	sprintf( szSection, "%s", pBot->m_ScriptData.aszStringStack[pBot->m_ScriptData.lStringStackPosition - 1] );
 	pBot->PopStringStack( );
@@ -2666,9 +2654,7 @@
 	CChatFile	*pFile;
 
 	// We can now get rid of the chat bubble above the bot's head.
-	pBot->GetPlayer( )->bChatting = false;
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SetPlayerStatus( pBot->GetPlayer( ) - players, PLAYERSTATUS_CHATTING );
+	PLAYER_SetStatus( pBot->GetPlayer( ), PLAYERSTATUS_CHATTING, false );
 
 	sprintf( szSection, "%s", pBot->m_ScriptData.aszStringStack[pBot->m_ScriptData.lStringStackPosition - 1] );
 	pBot->PopStringStack( );

diff -r 2c280cd262f3 -r 850eeed37215 src/c_console.cpp
--- a/src/c_console.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/c_console.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -1693,27 +1693,14 @@
 		TabbedLast = false;
 		TabbedList = false;
 
-		// [BB] Don't change the displayed console status when a demo is played.
-		if ( CLIENTDEMO_IsPlaying( ) == false )
-			players[consoleplayer].bInConsole = true;
-
-		// [RC] Tell the server so we get an "in console" icon.
-		if ( NETWORK_GetState( ) == NETSTATE_CLIENT )
-			CLIENTCOMMANDS_EnterConsole( );
+		PLAYER_SetStatus( &players[consoleplayer], PLAYERSTATUS_INCONSOLE, true, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 	}
 	else if (gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP)
 	{
 		ConsoleState = c_rising;
 		C_FlushDisplay ();
 
-		// [BB] Don't change the displayed console status when a demo is played.
-		if ( CLIENTDEMO_IsPlaying( ) == false )
-			players[consoleplayer].bInConsole = false;
-
-		// [RC] Tell the server so our "in console" icon is removed.
-		if ( NETWORK_GetState( ) == NETSTATE_CLIENT )
-			CLIENTCOMMANDS_ExitConsole( );
-
+		PLAYER_SetStatus( &players[consoleplayer], PLAYERSTATUS_INCONSOLE, false, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 	}
 }
 
@@ -1733,13 +1720,7 @@
 		// [BB] We are not in console anymore, so set bInConsole if necessary.
 		if ( players[consoleplayer].bInConsole )
 		{
-			// [BB] Don't change the displayed console status when a demo is played.
-			if ( CLIENTDEMO_IsPlaying( ) == false )
-				players[consoleplayer].bInConsole = false;
-
-			// [RC] Tell the server so our "in console" icon is removed.
-			if ( NETWORK_GetState( ) == NETSTATE_CLIENT )
-				CLIENTCOMMANDS_ExitConsole( );
+			PLAYER_SetStatus( &players[consoleplayer], PLAYERSTATUS_INCONSOLE, false, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 		}
 	}
 }

diff -r 2c280cd262f3 -r 850eeed37215 src/chat.cpp
--- a/src/chat.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/chat.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -845,22 +845,14 @@
 
 		if ( ulMode != CHATMODE_NONE )
 		{
-			pPlayer->bChatting = true;
-
-			// Tell the server we're beginning to chat.
-			if ( NETWORK_GetState( ) == NETSTATE_CLIENT )
-				CLIENTCOMMANDS_StartChat( );
+			PLAYER_SetStatus( pPlayer, PLAYERSTATUS_CHATTING, true, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 
 			// [AK] Ensure that the cursor starts off as white.
 			g_ulChatTicker = 0;
 		}
 		else
 		{
-			pPlayer->bChatting = false;
-
-			// Tell the server we're done chatting.
-			if ( NETWORK_GetState( ) == NETSTATE_CLIENT )
-				CLIENTCOMMANDS_EndChat( );
+			PLAYER_SetStatus( pPlayer, PLAYERSTATUS_CHATTING, false, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 		}
 
 	}

diff -r 2c280cd262f3 -r 850eeed37215 src/cl_main.cpp
--- a/src/cl_main.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/cl_main.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -4190,28 +4190,7 @@
 //
 void ServerCommands::SetPlayerStatus::Execute()
 {
-	switch ( type )
-	{
-		case PLAYERSTATUS_CHATTING:
-			player->bChatting = value;
-			break;
-
-		case PLAYERSTATUS_INCONSOLE:
-			player->bInConsole = value;
-			break;
-
-		case PLAYERSTATUS_INMENU:
-			player->bInMenu = value;
-			break;
-
-		case PLAYERSTATUS_LAGGING:
-			player->bLagging = value;
-			break;
-
-		case PLAYERSTATUS_READYTOGOON:
-			player->bReadyToGoOn = value;
-			break;
-	}
+	PLAYER_SetStatus( player, type, value );
 }
 
 //*****************************************************************************

diff -r 2c280cd262f3 -r 850eeed37215 src/d_player.h
--- a/src/d_player.h	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/d_player.h	Mon Nov 21 10:56:35 2022 -0500
@@ -798,6 +798,7 @@
 void	PLAYER_SetWins( player_t *pPlayer, ULONG ulWins );
 void	PLAYER_SetKills( player_t *pPlayer, ULONG ulKills );
 void	PLAYER_SetDeaths( player_t *pPlayer, ULONG ulDeaths, bool bInformClients = true );
+void	PLAYER_SetStatus( player_t *pPlayer, ULONG ulType, bool bEnable, ULONG ulFlags = 0 );
 // [BB] PLAYER_GetHealth and PLAYER_GetLivesLeft are helper functions for PLAYER_GetPlayerWithSingleHighestValue.
 LONG	PLAYER_GetHealth( ULONG ulPlayer );
 LONG	PLAYER_GetLivesLeft( ULONG ulPlayer );

diff -r 2c280cd262f3 -r 850eeed37215 src/menu/menu.cpp
--- a/src/menu/menu.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/menu/menu.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -341,13 +341,7 @@
 	BackbuttonTime = 0;
 	BackbuttonAlpha = 0;
 
-	// [BB] Don't change the displayed menu status when a demo is played.
-	if ( CLIENTDEMO_IsPlaying() == false )
-		players[consoleplayer].bInMenu = true;
-
-	// [RC] Tell the server so we get an "in menu" icon.
-	if ( NETWORK_GetState() == NETSTATE_CLIENT )
-		CLIENTCOMMANDS_EnterMenu();
+	PLAYER_SetStatus( &players[consoleplayer], PLAYERSTATUS_INMENU, true, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 }
 
 //=============================================================================
@@ -870,17 +864,7 @@
 	ServerSetupMenu = NULL;
 	ServerMenuEnabled = false;
 
-	// [BB] We are not in menu anymore, so set bInMenu if necessary.
-	if ( players[consoleplayer].bInMenu )
-	{
-		// [BB] Don't change the displayed menu status when a demo is played.
-		if ( CLIENTDEMO_IsPlaying() == false )
-			players[consoleplayer].bInMenu = false;
-
-		// [RC] Tell the server so our "in Menu" icon is removed.
-		if ( NETWORK_GetState() == NETSTATE_CLIENT )
-			CLIENTCOMMANDS_ExitMenu();
-	}
+	PLAYER_SetStatus( &players[consoleplayer], PLAYERSTATUS_INMENU, false, PLAYERSTATUS_CLIENTSHOULDSENDUPDATE );
 }
 
 //=============================================================================

diff -r 2c280cd262f3 -r 850eeed37215 src/network.h
--- a/src/network.h	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/network.h	Mon Nov 21 10:56:35 2022 -0500
@@ -230,6 +230,12 @@
 	PLAYERSTATUS_READYTOGOON,
 };
 
+enum PlayerStatusFlag
+{
+	PLAYERSTATUS_CLIENTSHOULDSENDUPDATE = 1 << 0,
+	PLAYERSTATUS_SERVERSHOULDSKIPCLIENT = 1 << 1,
+};
+
 // [AK] If we're updating the map rotation then what exactly are we doing?
 enum UpdateMapRotationType
 {

diff -r 2c280cd262f3 -r 850eeed37215 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/p_interaction.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -2821,6 +2821,114 @@
 
 //*****************************************************************************
 //
+void PLAYER_SetStatus( player_t *pPlayer, ULONG ulType, bool bEnable, ULONG ulFlags )
+{
+	if ( pPlayer == NULL )
+		return;
+
+	switch ( ulType )
+	{
+		case PLAYERSTATUS_CHATTING:
+		{
+			if ( pPlayer->bChatting == bEnable )
+				return;
+
+			pPlayer->bChatting = bEnable;
+
+			// [AK] Tell the server we're beginning to or have stopped chatting.
+			if (( NETWORK_GetState( ) == NETSTATE_CLIENT ) && ( ulFlags & PLAYERSTATUS_CLIENTSHOULDSENDUPDATE ))
+			{
+				if ( bEnable )
+					CLIENTCOMMANDS_StartChat( );
+				else
+					CLIENTCOMMANDS_EndChat( );
+			}
+
+			break;
+		}
+
+		case PLAYERSTATUS_INCONSOLE:
+		{
+			// [BB] Don't change the displayed console status when a demo is played.
+			if (( CLIENTDEMO_IsPlaying( )) || ( pPlayer->bInConsole == bEnable ))
+				return;
+
+			pPlayer->bInConsole = bEnable;
+
+			// [AK] Tell the server that we entered or exited the console.
+			if (( NETWORK_GetState( ) == NETSTATE_CLIENT ) && ( ulFlags & PLAYERSTATUS_CLIENTSHOULDSENDUPDATE ))
+			{
+				if ( bEnable )
+					CLIENTCOMMANDS_EnterConsole( );
+				else
+					CLIENTCOMMANDS_ExitConsole( );
+			}
+
+			break;
+		}
+
+		case PLAYERSTATUS_INMENU:
+		{
+			// [BB] Don't change the displayed menu status when a demo is played.
+			if (( CLIENTDEMO_IsPlaying( )) || ( pPlayer->bInMenu == bEnable ))
+				return;
+
+			pPlayer->bInMenu = bEnable;
+
+			// [AK] Tell the server that we entered or exited the menu.
+			if (( NETWORK_GetState( ) == NETSTATE_CLIENT ) && ( ulFlags & PLAYERSTATUS_CLIENTSHOULDSENDUPDATE ))
+			{
+				if ( bEnable )
+					CLIENTCOMMANDS_EnterMenu( );
+				else
+					CLIENTCOMMANDS_ExitMenu( );
+			}
+
+			break;
+		}
+
+		case PLAYERSTATUS_LAGGING:
+		{
+			if ( pPlayer->bLagging == bEnable )
+				return;
+
+			pPlayer->bLagging = bEnable;
+			break;
+		}
+
+		case PLAYERSTATUS_READYTOGOON:
+		{
+			if ( pPlayer->bReadyToGoOn == bEnable )
+				return;
+
+			pPlayer->bReadyToGoOn = bEnable;
+			break;
+		}
+
+		default:
+			return;
+	}
+
+	// [AK] If we're the server, tell the clients that this player's status changed,
+	// except when we update this player's "ready to go on" status if everyone's ready.
+	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
+	{
+		if (( ulType != PLAYERSTATUS_READYTOGOON ) || ( SERVER_IsEveryoneReadyToGoOn( ) == false ))
+		{
+			const ULONG ulPlayer = pPlayer - players;
+
+			// [AK] Should we skip sending an update to the client whose status we're changing?
+			// This is if the client already changed the status on their end.
+			if ( ulFlags & PLAYERSTATUS_SERVERSHOULDSKIPCLIENT )
+				SERVERCOMMANDS_SetPlayerStatus( ulPlayer, static_cast<PlayerStatusType>( ulType ), ulPlayer, SVCF_SKIPTHISCLIENT );
+			else
+				SERVERCOMMANDS_SetPlayerStatus( ulPlayer, static_cast<PlayerStatusType>( ulType ));
+		}
+	}
+}
+
+//*****************************************************************************
+//
 LONG PLAYER_GetHealth( ULONG ulPlayer )
 {
 	return players[ulPlayer].health;

diff -r 2c280cd262f3 -r 850eeed37215 src/sv_main.cpp
--- a/src/sv_main.cpp	Sat Oct 29 23:16:47 2022 -0400
+++ b/src/sv_main.cpp	Mon Nov 21 10:56:35 2022 -0500
@@ -1082,19 +1082,13 @@
 			// Have not heard from the client in at least one second; mark him as
 			// lagging and tell clients.
 			if ( players[ulIdx].bLagging == false )
-			{
-				players[ulIdx].bLagging = true;
-				SERVERCOMMANDS_SetPlayerStatus( ulIdx, PLAYERSTATUS_LAGGING );
-			}
+				PLAYER_SetStatus( &players[ulIdx], PLAYERSTATUS_LAGGING, true );
 		}
 		else
 		{
 			// Player is no longer lagging. Tell clients.
 			if ( players[ulIdx].bLagging )
-			{
-				players[ulIdx].bLagging = false;
-				SERVERCOMMANDS_SetPlayerStatus( ulIdx, PLAYERSTATUS_LAGGING );
-			}
+				PLAYER_SetStatus( &players[ulIdx], PLAYERSTATUS_LAGGING, false );
 		}
 	}
 }
@@ -4767,48 +4761,25 @@
 		if ( server_CheckForClientMinorCommandFlood ( g_lCurrentClient ) == true )
 			return ( true );
 
+		// Client is beginning to type.
 		if ( lCommand == CLC_STARTCHAT )
-		{
-			// Client is beginning to type.
-			players[g_lCurrentClient].bChatting = true;
-
-			// Tell clients about the change in this player's chatting status.
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_CHATTING );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_CHATTING, true, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+		// Client is done talking.
 		else if ( lCommand == CLC_ENDCHAT )
-		{
-			// Client is done talking.
-			players[g_lCurrentClient].bChatting = false;
-
-			// Tell clients about the change in this player's chatting status.
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_CHATTING );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_CHATTING, false, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+		// Player has entered the console - give him an icon.
 		else if ( lCommand == CLC_ENTERCONSOLE )
-		{
-
-			// Player has entered the console - give him an icon.
-			players[g_lCurrentClient].bInConsole = true;
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_INCONSOLE );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_INCONSOLE, true, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+		// Player has left the console - remove his icon.
 		else if ( lCommand == CLC_EXITCONSOLE )
-		{
-			// Player has left the console - remove his icon.
-			players[g_lCurrentClient].bInConsole = false;
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_INCONSOLE );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_INCONSOLE, false, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+		// Player has entered the menu - give him an icon.
 		else if ( lCommand == CLC_ENTERMENU )
-		{
-
-			// Player has entered the console - give him an icon.
-			players[g_lCurrentClient].bInMenu = true;
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_INMENU );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_INMENU, true, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+		// Player has left the menu - remove his icon.
 		else if ( lCommand == CLC_EXITMENU )
-		{
-			// Player has left the console - remove his icon.
-			players[g_lCurrentClient].bInMenu = false;
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_INMENU );
-		}
+			PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_INMENU, false, PLAYERSTATUS_SERVERSHOULDSKIPCLIENT );
+
 		return false;
 	case CLC_IGNORE:
 
@@ -4901,10 +4872,7 @@
 
 		// Toggle this player (specator)'s "ready to go on" status.
 		// [RC] Now a permanent choice.
-		players[g_lCurrentClient].bReadyToGoOn = true;
-
-		if ( SERVER_IsEveryoneReadyToGoOn( ) == false )
-			SERVERCOMMANDS_SetPlayerStatus( g_lCurrentClient, PLAYERSTATUS_READYTOGOON );
+		PLAYER_SetStatus( &players[g_lCurrentClient], PLAYERSTATUS_READYTOGOON, true );
 
 		return false;
 	case CLC_CHANGEDISPLAYPLAYER:
@@ -6070,23 +6038,15 @@
 	{
 		// [K6/BB] The client is pressing a button, so not afk.
 		g_aClients[ulClient].lLastActionTic = gametic;
+
 		if ( pPlayer->bChatting )
-		{
-			pPlayer->bChatting = false;
-			SERVERCOMMANDS_SetPlayerStatus( ulClient, PLAYERSTATUS_CHATTING );
-		}
+			PLAYER_SetStatus( &players[ulClient], PLAYERSTATUS_CHATTING, false );
 
 		if ( pPlayer->bInConsole )
-		{
-			pPlayer->bInConsole = false;
-			SERVERCOMMANDS_SetPlayerStatus( ulClient, PLAYERSTATUS_INCONSOLE );
-		}
+			PLAYER_SetStatus( &players[ulClient], PLAYERSTATUS_INCONSOLE, false );
 
 		if ( pPlayer->bInMenu )
-		{
-			pPlayer->bInMenu = false;
-			SERVERCOMMANDS_SetPlayerStatus( ulClient, PLAYERSTATUS_INMENU );
-		}
+			PLAYER_SetStatus( &players[ulClient], PLAYERSTATUS_INMENU, false );
 	}
 
 	return ( false );