Commit: c363af79fb90d1d7b9f79bc82289ff0e71708fc1 - zandrodev (hg)

Commit MetaInfo

• Revisión: c363af79fb90d1d7b9f79bc82289ff0e71708fc1 (tree)
• Tiempo: 2021-11-28 23:38:45
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

The result value of GAMEEVENT_ACTOR_DAMAGED event scripts can now be used to change the final damage that the target will take.

Cambiar Resumen

• modified: src/gamemode.cpp
• modified: src/gamemode.h
• modified: src/p_interaction.cpp

Diferencia incremental

diff -r a9f4423847ec -r c363af79fb90 src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Nov 28 09:34:13 2021 -0500
+++ b/src/gamemode.cpp	Sun Nov 28 09:38:45 2021 -0500
@@ -1110,16 +1110,16 @@
 
 //*****************************************************************************
 //
-void GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int damage, FName mod )
+bool GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod )
 {
 	// [AK] Don't run any scripts if the target doesn't allow executing GAMEEVENT_ACTOR_DAMAGED.
 	if ( target->STFlags & STFL_NODAMAGEEVENTSCRIPT )
-		return;
+		return true;
 
 	// [AK] Don't run any scripts if the target can't execute GAMEEVENT_ACTOR_DAMAGED unless
 	// all actors are forced to execute it.
 	if ((( target->STFlags & STFL_USEDAMAGEEVENTSCRIPT ) == false ) && ( gameinfo.bForceDamageEventScripts == false ))
-		return;
+		return true;
 	
 	// [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,
@@ -1131,10 +1131,14 @@
 	temp->master = source;
 	temp->tracer = inflictor;
 
-	GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_DAMAGED, temp, damage, GlobalACSStrings.AddString( mod ));
+	GAMEMODE_SetEventResult( damage );
+	damage = GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_DAMAGED, temp, damage, GlobalACSStrings.AddString( mod ));
 
 	// [AK] Destroy the temporary actor after executing all event scripts.
 	temp->Destroy( );
+
+	// [AK] If the new damage is zero, that means the target shouldn't take damage in P_DamageMobj.
+	return ( damage != 0 );
 }
 
 //*****************************************************************************

diff -r a9f4423847ec -r c363af79fb90 src/gamemode.h
--- a/src/gamemode.h	Sun Nov 28 09:34:13 2021 -0500
+++ b/src/gamemode.h	Sun Nov 28 09:38:45 2021 -0500
@@ -213,7 +213,7 @@
 GAMESTATE_e	GAMEMODE_GetState ( void );
 void		GAMEMODE_SetState ( GAMESTATE_e GameState );
 LONG		GAMEMODE_HandleEvent ( const GAMEEVENT_e Event, AActor *pActivator = NULL, const int DataOne = 0, const int DataTwo = 0 );
-void		GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int damage, FName mod );
+bool		GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod );
 LONG		GAMEMODE_GetEventResult ( void );
 void		GAMEMODE_SetEventResult ( LONG lResult );
 

diff -r a9f4423847ec -r c363af79fb90 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sun Nov 28 09:34:13 2021 -0500
+++ b/src/p_interaction.cpp	Sun Nov 28 09:38:45 2021 -0500
@@ -1573,7 +1573,10 @@
 			}
 			
 			// [AK] Trigger an event script indicating that the player has taken damage, if we can.
-			GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod );
+			// If the event returns 0, then the target doesn't take damage and we do nothing.
+			if ( GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod ) == false )
+				return -1;
+
 			bDamageEventHandled = true;
 
 			if (damage >= player->health
@@ -1585,8 +1588,9 @@
 		}
 
 		// [AK] If we haven't done so already, trigger an event script indicating that the player has taken damage.
-		if ( bDamageEventHandled == false )
-			GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod );
+		// If the event returns 0, then the target doesn't take damage and we do nothing.
+		if (( bDamageEventHandled == false ) && ( GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod ) == false ))
+			return -1;
 
 		player->health -= damage;		// mirror mobj health here for Dave
 		// [RH] Make voodoo dolls and real players record the same health
@@ -1653,7 +1657,9 @@
 		}
 	
 		// [AK] Trigger an event script indicating that the target actor has taken damage, if we can.
-		GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod );
+		// If the event returns 0, then the target doesn't take damage and we do nothing.
+		if ( GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod ) == false )
+			return -1;
 
 		target->health -= damage;	
 	}