Commit: 59f1474300fa889904ba85ce4526a0734db3af08 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revisión: 59f1474300fa889904ba85ce4526a0734db3af08 (tree)
• Tiempo: 2021-10-04 04:46:48
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed the activator's target and master pointers in GAMEEVENT_ACTOR_DAMAGED event scripts.

Cambiar Resumen

• modified: src/gamemode.cpp
• modified: src/p_acs.cpp

Diferencia incremental

diff -r f9fa0270195b -r 59f1474300fa src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Oct 03 12:38:58 2021 -0400
+++ b/src/gamemode.cpp	Sun Oct 03 15:46:48 2021 -0400
@@ -1115,21 +1115,20 @@
 	if ((( target->STFlags & STFL_USEDAMAGEEVENTSCRIPT ) == false ) && ( gameinfo.bForceDamageEventScripts == false ))
 		return;
 	
-	// [AK] We somehow need to pass the source and inflictor actor pointers into the script
-	// itself. A simple way to do this is temporarily changing the target's pointers to the
-	// source and inflictor, which we'll then use to initialize AAPTR_DAMAGE_SOURCE and
-	// AAPTR_DAMAGE_INFLICTOR for the script.
-	// The source actor is the activator, which we'll use to initialize AAPTR_DAMAGE_TARGET.
-	AActor *tempMaster = target->master;
-	AActor *tempTarget = target->target;
-	target->master = source;
-	target->target = inflictor;
+	// [AK] We somehow need to pass all the actor pointers into the script itself. A simple way
+	// to do this is temporarily spawn a temporary actor and change its actor pointers to the target,
+	// source, and inflictor. We can then use these to initialize the AAPTR_DAMAGE_TARGET,
+	// AAPTR_DAMAGE_SOURCE, and AAPTR_DAMAGE_INFLICTOR pointers of the script.
+	AActor *temp = Spawn( "MapSpot", target->x, target->y, target->z, NO_REPLACE );
 
-	GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_DAMAGED, target, damage, GlobalACSStrings.AddString( mod ));
+	temp->target = target;
+	temp->master = source;
+	temp->tracer = inflictor;
 
-	// [AK] Restore the source actor's old pointers.
-	target->master = tempMaster;
-	target->target = tempTarget;
+	GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_DAMAGED, temp, damage, GlobalACSStrings.AddString( mod ));
+
+	// [AK] Destroy the temporary actor after executing all event scripts.
+	temp->Destroy( );
 }
 
 //*****************************************************************************

diff -r f9fa0270195b -r 59f1474300fa src/p_acs.cpp
--- a/src/p_acs.cpp	Sun Oct 03 12:38:58 2021 -0400
+++ b/src/p_acs.cpp	Sun Oct 03 15:46:48 2021 -0400
@@ -11656,14 +11656,16 @@
 
 	// [AK] Check if this is an event script triggered by GAMEEVENT_ACTOR_DAMAGED. This is
 	// where we initialize the script's target, source, and inflictor pointers by using the
-	// activator as the target, and the activator's own master and target, which are the
-	// source and inflictor respectively.
+	// temporary activator's own pointers.
 	if (( NETWORK_InClientMode( ) == false ) && ( who != NULL ) &&
 		( code->Type == SCRIPT_Event ) && ( args[0] == GAMEEVENT_ACTOR_DAMAGED ))
 	{
-		pDamageTarget = who;
+		pDamageTarget = who->target;
 		pDamageSource = who->master;
-		pDamageInflictor = who->target;
+		pDamageInflictor = who->tracer;
+
+		// [AK] Make the target actor the activator.
+		activator = pDamageTarget;
 	}
 	else
 	{