Commit: 4cfb3337055305dc0c9c3679304bc943c99befe7 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• Revisión: 4cfb3337055305dc0c9c3679304bc943c99befe7 (tree)
• Tiempo: 2022-11-27 12:56:59
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added the helper function PLAYER_SetTime.

Cambiar Resumen

• modified: src/cl_main.cpp
• modified: src/d_player.h
• modified: src/p_interaction.cpp
• modified: src/p_tick.cpp

Diferencia incremental

diff -r 850eeed37215 -r 4cfb33370553 src/cl_main.cpp
--- a/src/cl_main.cpp	Mon Nov 21 10:56:35 2022 -0500
+++ b/src/cl_main.cpp	Sat Nov 26 22:56:59 2022 -0500
@@ -4416,7 +4416,7 @@
 //
 void ServerCommands::UpdatePlayerTime::Execute()
 {
-	player->ulTime = time * ( TICRATE * 60 );
+	PLAYER_SetTime( player, time * ( TICRATE * 60 ));
 }
 
 //*****************************************************************************

diff -r 850eeed37215 -r 4cfb33370553 src/d_player.h
--- a/src/d_player.h	Mon Nov 21 10:56:35 2022 -0500
+++ b/src/d_player.h	Sat Nov 26 22:56:59 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_SetTime( player_t *pPlayer, ULONG ulTime );
 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 );

diff -r 850eeed37215 -r 4cfb33370553 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Mon Nov 21 10:56:35 2022 -0500
+++ b/src/p_interaction.cpp	Sat Nov 26 22:56:59 2022 -0500
@@ -2821,6 +2821,30 @@
 
 //*****************************************************************************
 //
+void PLAYER_SetTime( player_t *pPlayer, ULONG ulTime )
+{
+	if ( pPlayer == NULL )
+		return;
+
+	// Set the player's time.
+	pPlayer->ulTime = ulTime;
+
+	// Potentially update the scoreboard or send out an update.
+	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
+	{
+		if (( pPlayer->ulTime % ( TICRATE * 60 )) == 0 )
+		{
+			// Send out the updated time field to all clients.
+			SERVERCOMMANDS_UpdatePlayerTime( pPlayer - players );
+
+			// Update the console as well.
+			SERVERCONSOLE_UpdatePlayerInfo( pPlayer - players, UDF_TIME );
+		}
+	}
+}
+
+//*****************************************************************************
+//
 void PLAYER_SetStatus( player_t *pPlayer, ULONG ulType, bool bEnable, ULONG ulFlags )
 {
 	if ( pPlayer == NULL )

diff -r 850eeed37215 -r 4cfb33370553 src/p_tick.cpp
--- a/src/p_tick.cpp	Mon Nov 21 10:56:35 2022 -0500
+++ b/src/p_tick.cpp	Sat Nov 26 22:56:59 2022 -0500
@@ -357,26 +357,8 @@
 	for ( ulIdx = 0; ulIdx < MAXPLAYERS; ulIdx++ )
 	{
 		// Increment individual player time.
-		if ( NETWORK_InClientMode() == false )
-		{
-			if ( playeringame[ulIdx] )
-			{
-				players[ulIdx].ulTime++;
-
-				// Potentially update the scoreboard or send out an update.
-				if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-				{
-					if (( players[ulIdx].ulTime % ( TICRATE * 60 )) == 0 )
-					{
-						// Send out the updated time field to all clients.
-						SERVERCOMMANDS_UpdatePlayerTime( ulIdx );
-
-						// Update the console as well.
-						SERVERCONSOLE_UpdatePlayerInfo( ulIdx, UDF_TIME );
-					}
-				}
-			}
-		}
+		if (( NETWORK_InClientMode( ) == false ) && ( playeringame[ulIdx] ))
+			PLAYER_SetTime( &players[ulIdx], players[ulIdx].ulTime + 1 );
 
 		// Clients "think" every time we process a movement command.
 		// [BB] The server has to think for lagging clients, otherwise they aren't affected by things like sector damage.