Commit: 163edfd342dd2304bee348dc8c4b0cae1a17f451 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisão: 163edfd342dd2304bee348dc8c4b0cae1a17f451 (tree)
• Hora: 2017-03-19 20:01:50
• Autor: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Mensagem de Log

Fixed: Blood splatter caused unnecessary network traffic (partially addresses 2655).

Mudança Sumário

• modified: docs/zandronum-history.txt
• modified: src/p_mobj.cpp

Diff

diff -r 3fb9b28e33ff -r 163edfd342dd docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Sat Mar 18 18:54:46 2017 +0100
+++ b/docs/zandronum-history.txt	Sun Mar 19 12:01:50 2017 +0100
@@ -115,6 +115,7 @@
 -	- Fixed: When the server instructed a client to jump as result of A_Jump*, the client did not call the state function of the state jumped to. [Torr Samaho]
 -	- Fixed: The server didn't fully notify the clients about water splashes. [Torr Samaho]
 -	- Fixed a potential client crash related to the firing sound of a railgun. [Torr Samaho]
+-	- Fixed: Blood splatter caused unnecessary network traffic. [Torr Samaho]
 !	- Changed: Spectators can now interact with gravity and use the fly/land commands. [Leonard]
 !	- Save games now contain information about the renderer used to create the save. This allows to print a proper error message when an incompatible save is tried to be loaded. [Torr Samaho]
 !	- Clients don't error out anymore when encountering a division by zero in a DECORATE expression. Instead, a one time warning is printed on the first occasion and the result is assumed to be zero. This is necessary since clients can encounter this in valid DECORATE code due to Zandronum's jump handling. [Torr Samaho]

diff -r 3fb9b28e33ff -r 163edfd342dd src/p_mobj.cpp
--- a/src/p_mobj.cpp	Sat Mar 18 18:54:46 2017 +0100
+++ b/src/p_mobj.cpp	Sun Mar 19 12:01:50 2017 +0100
@@ -6621,6 +6621,15 @@
 		mo->vely = pr_splatter.Random2 () << 10;
 		mo->velz = 3*FRACUNIT;
 
+		// [BB] This is not fully synced, but handled with SERVERCOMMANDS_SpawnBloodSplatter.
+		// In order to prevent the server from printing warnings when the server calls P_ExplodeMissile,
+		// we also mark this as SERVERSIDEONLY.
+		if ( NETWORK_GetState () == NETSTATE_SERVER )
+		{
+			mo->ulNetworkFlags |= NETFL_SERVERSIDEONLY;
+			mo->FreeNetID ();
+		}
+
 		// colorize the blood!
 		if (bloodcolor!=0 && !(mo->flags2 & MF2_DONTTRANSLATE)) 
 		{