Commit: aee60744466308e2120fe2e762cd5ca0e0c530b9 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisão: aee60744466308e2120fe2e762cd5ca0e0c530b9 (tree)
• Hora: 2017-03-13 03:29:47
• Autor: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Mensagem de Log

Fixed: In DECORATE, ACS_NamedExecuteWithResult, ACS_NamedExecute, ACS_NamedExecuteAlways, ACS_NamedLockedExecute and ACS_NamedLockedExecuteDoor executed the script on client and server instead of only on the server (addresses 3012).

Mudança Sumário

• modified: src/thingdef/thingdef_codeptr.cpp

Diff

diff -r b63485819ffe -r aee607444663 src/thingdef/thingdef_codeptr.cpp
--- a/src/thingdef/thingdef_codeptr.cpp	Sun Mar 05 22:52:46 2017 +0100
+++ b/src/thingdef/thingdef_codeptr.cpp	Sun Mar 12 19:29:47 2017 +0100
@@ -5549,6 +5549,10 @@
 	ACTION_PARAM_INT(arg3, 3);
 	ACTION_PARAM_INT(arg4, 4);
 
+	// [BB] This is handled server-side.
+	if ( NETWORK_InClientModeAndActorNotClientHandled( self ) )
+		return;
+
 	bool res = !!P_ExecuteSpecial(ACS_ExecuteWithResult, NULL, self, false, -scriptname, arg1, arg2, arg3, arg4);
 
 	ACTION_SET_RESULT(res);
@@ -5564,6 +5568,10 @@
 	ACTION_PARAM_INT(arg2, 3);
 	ACTION_PARAM_INT(arg3, 4);
 
+	// [BB] This is handled server-side.
+	if ( NETWORK_InClientModeAndActorNotClientHandled( self ) )
+		return;
+
 	bool res = !!P_ExecuteSpecial(ACS_Execute, NULL, self, false, -scriptname, mapnum, arg1, arg2, arg3);
 
 	ACTION_SET_RESULT(res);
@@ -5579,6 +5587,10 @@
 	ACTION_PARAM_INT(arg2, 3);
 	ACTION_PARAM_INT(arg3, 4);
 
+	// [BB] This is handled server-side.
+	if ( NETWORK_InClientModeAndActorNotClientHandled( self ) )
+		return;
+
 	bool res = !!P_ExecuteSpecial(ACS_ExecuteAlways, NULL, self, false, -scriptname, mapnum, arg1, arg2, arg3);
 
 	ACTION_SET_RESULT(res);
@@ -5594,6 +5606,10 @@
 	ACTION_PARAM_INT(arg2, 3);
 	ACTION_PARAM_INT(lock, 4);
 
+	// [BB] This is handled server-side.
+	if ( NETWORK_InClientModeAndActorNotClientHandled( self ) )
+		return;
+
 	bool res = !!P_ExecuteSpecial(ACS_LockedExecute, NULL, self, false, -scriptname, mapnum, arg1, arg2, lock);
 
 	ACTION_SET_RESULT(res);
@@ -5609,6 +5625,10 @@
 	ACTION_PARAM_INT(arg2, 3);
 	ACTION_PARAM_INT(lock, 4);
 
+	// [BB] This is handled server-side.
+	if ( NETWORK_InClientModeAndActorNotClientHandled( self ) )
+		return;
+
 	bool res = !!P_ExecuteSpecial(ACS_LockedExecuteDoor, NULL, self, false, -scriptname, mapnum, arg1, arg2, lock);
 
 	ACTION_SET_RESULT(res);