Commit: 3b50783ec354c8ae306db8680e492b8df5eb8813 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• Revision: 3b50783ec354c8ae306db8680e492b8df5eb8813 (tree)
• Time: 2022-08-25 22:15:20
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added an optional parameter to GAMEMODE_HandleEvent that decides whether the event script is executed immediately or not. By default, this is set to false.

Change Summary

• modified: src/chat.cpp
• modified: src/gamemode.cpp
• modified: src/gamemode.h
• modified: src/p_mobj.cpp
• modified: src/sv_main.cpp

Incremental Difference

diff -r d5b440d54c74 -r 3b50783ec354 src/chat.cpp
--- a/src/chat.cpp	Thu Aug 25 08:24:19 2022 -0400
+++ b/src/chat.cpp	Thu Aug 25 09:15:20 2022 -0400
@@ -1087,7 +1087,7 @@
 
 		// [AK] Trigger an event script indicating that a chat message was received.
 		// If the event returns 0, then don't print the message.
-		if ( GAMEMODE_HandleEvent( GAMEEVENT_CHAT, NULL, ulPlayer != MAXPLAYERS ? ulPlayer : -1, ulMode - CHATMODE_GLOBAL ) == 0 )
+		if ( GAMEMODE_HandleEvent( GAMEEVENT_CHAT, NULL, ulPlayer != MAXPLAYERS ? ulPlayer : -1, ulMode - CHATMODE_GLOBAL, true ) == 0 )
 			return;
 
 		BOTCMD_SetLastChatString( ChatString );

diff -r d5b440d54c74 -r 3b50783ec354 src/gamemode.cpp
--- a/src/gamemode.cpp	Thu Aug 25 08:24:19 2022 -0400
+++ b/src/gamemode.cpp	Thu Aug 25 09:15:20 2022 -0400
@@ -1079,7 +1079,7 @@
 
 //*****************************************************************************
 //
-LONG GAMEMODE_HandleEvent ( const GAMEEVENT_e Event, AActor *pActivator, const int DataOne, const int DataTwo, const int OverrideResult )
+LONG GAMEMODE_HandleEvent ( const GAMEEVENT_e Event, AActor *pActivator, const int DataOne, const int DataTwo, const bool bRunNow, const int OverrideResult )
 {
 	// [BB] Clients don't start scripts.
 	if ( NETWORK_InClientMode() )
@@ -1091,13 +1091,6 @@
 	const LONG lOldResult = GAMEMODE_GetEventResult( );
 	GAMEMODE_SetEventResult( OverrideResult );
 
-	// [AK] Allow events that are triggered by an actor spawning or
-	// taking damage to be executed immediately, in case any of the
-	// actor pointers that were responsible for calling the event
-	// become NULL after one tic.
-	// Also allow chat events to be executed immediately.
-	const bool bRunNow = ( Event == GAMEEVENT_ACTOR_SPAWNED || Event == GAMEEVENT_ACTOR_DAMAGED || Event == GAMEEVENT_ACTOR_ARMORDAMAGED || Event == GAMEEVENT_CHAT );
-
 	// [BB] The activator of the event activates the event script.
 	// The first argument is the type, e.g. GAMEEVENT_PLAYERFRAGS,
 	// the second and third are specific to the event, e.g. the second is the number of the fragged player.
@@ -1138,7 +1131,7 @@
 	temp->master = source;
 	temp->tracer = inflictor;
 
-	damage = GAMEMODE_HandleEvent( DamageEvent, temp, damage, GlobalACSStrings.AddString( mod ), damage );
+	damage = GAMEMODE_HandleEvent( DamageEvent, temp, damage, GlobalACSStrings.AddString( mod ), true, damage );
 
 	// [AK] Destroy the temporary actor after executing all event scripts.
 	temp->Destroy( );

diff -r d5b440d54c74 -r 3b50783ec354 src/gamemode.h
--- a/src/gamemode.h	Thu Aug 25 08:24:19 2022 -0400
+++ b/src/gamemode.h	Thu Aug 25 09:15:20 2022 -0400
@@ -213,7 +213,7 @@
 bool		GAMEMODE_IsHandledSpecial ( AActor *Activator, int Special );
 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, const int OverrideResult = 1 );
+LONG		GAMEMODE_HandleEvent ( const GAMEEVENT_e Event, AActor *pActivator = NULL, const int DataOne = 0, const int DataTwo = 0, const bool bRunNow = false, const int OverrideResult = 1 );
 bool		GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod, bool bBeforeArmor = false );
 LONG		GAMEMODE_GetEventResult ( void );
 void		GAMEMODE_SetEventResult ( LONG lResult );

diff -r d5b440d54c74 -r 3b50783ec354 src/p_mobj.cpp
--- a/src/p_mobj.cpp	Thu Aug 25 08:24:19 2022 -0400
+++ b/src/p_mobj.cpp	Thu Aug 25 09:15:20 2022 -0400
@@ -5205,7 +5205,7 @@
 		// [AK] If we want to force GAMEEVENT_ACTOR_SPAWNED on every actor, then at least ignore 
 		// the less imporant actors unless they have the USESPAWNEVENTSCRIPT flag enabled.
 		if (( STFlags & STFL_USESPAWNEVENTSCRIPT ) || (( gameinfo.bForceSpawnEventScripts ) && ( bNotImportant == false )))
-			GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_SPAWNED, this, !!( STFlags & STFL_LEVELSPAWNED ));
+			GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_SPAWNED, this, !!( STFlags & STFL_LEVELSPAWNED ), 0, true );
 	}
 }
 

diff -r d5b440d54c74 -r 3b50783ec354 src/sv_main.cpp
--- a/src/sv_main.cpp	Thu Aug 25 08:24:19 2022 -0400
+++ b/src/sv_main.cpp	Thu Aug 25 09:15:20 2022 -0400
@@ -1219,7 +1219,7 @@
 
 		// [AK] Trigger an event script indicating that a chat message was received.
 		// If the event returns 0, then don't print the message or send it to the clients.
-		if ( GAMEMODE_HandleEvent( GAMEEVENT_CHAT, NULL, ulPlayer != MAXPLAYERS ? ulPlayer : -1, ulMode - CHATMODE_GLOBAL ) == 0 )
+		if ( GAMEMODE_HandleEvent( GAMEEVENT_CHAT, NULL, ulPlayer != MAXPLAYERS ? ulPlayer : -1, ulMode - CHATMODE_GLOBAL, true ) == 0 )
 			return;
 
 		SERVERCOMMANDS_PlayerSay( ulPlayer, pszString, ulMode, bForbidChatToPlayers );