提交: 4e2b0310c6f306b57a81986f15ef7984d5bd19b9 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• 修訂: 4e2b0310c6f306b57a81986f15ef7984d5bd19b9 (tree)
• 時間: 2022-10-22 23:08:42
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added two bit mask constants of GAMEMODE flags: one for all game types (i.e. cooperative, deathmatch, teamgame), and another for all earn types (i.e. kills, frags, points, wins).

Change Summary

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

差異

diff -r 32f2394fc70d -r 4e2b0310c6f3 src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Nov 20 20:47:43 2022 +0100
+++ b/src/gamemode.cpp	Sat Oct 22 10:08:42 2022 -0400
@@ -470,12 +470,12 @@
 			I_Error( "\"%s\" has no short name.", name.GetChars( ));
 
 		// [AK] Get the game mode type (cooperative, deathmatch, or team game). There shouldn't be more than one enabled or none at all.
-		ULONG ulFlags = g_GameModes[i].ulFlags & ( GMF_COOPERATIVE | GMF_DEATHMATCH | GMF_TEAMGAME );
+		ULONG ulFlags = g_GameModes[i].ulFlags & GAMETYPE_MASK;
 		if (( ulFlags == 0 ) || (( ulFlags & ( ulFlags - 1 )) != 0 ))
 			I_Error( "Can't determine if \"%s\" is cooperative, deathmatch, or team-based.", name.GetChars( ));
 
 		// [AK] Get the type of "players earn" flag this game mode is currently using.
-		ulFlags = g_GameModes[i].ulFlags & ( GMF_PLAYERSEARNKILLS | GMF_PLAYERSEARNFRAGS | GMF_PLAYERSEARNPOINTS | GMF_PLAYERSEARNWINS );
+		ulFlags = g_GameModes[i].ulFlags & EARNTYPE_MASK;
 
 		// [AK] If all of these flags were removed or if more than one was added, then throw an error.
 		if ( ulFlags == 0 )

diff -r 32f2394fc70d -r 4e2b0310c6f3 src/gamemode.h
--- a/src/gamemode.h	Sun Nov 20 20:47:43 2022 +0100
+++ b/src/gamemode.h	Sat Oct 22 10:08:42 2022 -0400
@@ -63,6 +63,9 @@
 // to go into a separate header for technical reasons.
 #include "gamemode_enums.h"
 
+#define GAMETYPE_MASK ( GMF_COOPERATIVE | GMF_DEATHMATCH | GMF_TEAMGAME )
+#define EARNTYPE_MASK ( GMF_PLAYERSEARNKILLS | GMF_PLAYERSEARNFRAGS | GMF_PLAYERSEARNPOINTS | GMF_PLAYERSEARNWINS )
+
 // [CK] Event defines
 #define GAMEEVENT_CAPTURE_NOASSIST -1	// The third arg meaning no player assisted
 #define GAMEEVENT_RETURN_TIMEOUTRETURN 0