Maintenance update

+ made killfeed optional via coop menu + some reorganizing
ampreeT · Nov 22, 2020 · 90b0167 · 90b0167
1 parent 1435c12
commit 90b0167
Show file tree

Hide file tree

Showing 17 changed files with 3,117 additions and 2,981 deletions.
diff --git a/configs/sourcecoop/menu_sorting.txt b/configs/sourcecoop/menu_sorting.txt
@@ -0,0 +1,15 @@
+"Menu"
+{
+	"PlayerSettings"
+	{
+	}
+
+	"SoundSettings"
+	{
+	}
+
+	"Other"
+	{
+	}
+}
+
diff --git a/data/srccoop/bm_c1a4b.edt b/data/srccoop/bm_c1a4b.edt
@@ -37,10 +37,10 @@
 				"delay_output" "OnNewGame"
 			}
 		}
-		// dont close controlroom door
+		// dont close controlroom door (except when pressed the rocket fire button)
 		"modify"
 		{
-			"targetname" "c1a4c_controlroom_exit_door_button"
+			"targetname" "/^(c1a4c_controlroom_exit_door_button|c1a4c_controlroom_entry_door_button)$/"
 			"outputs"
 			{
 				"remove"

diff --git a/plugins/srccoop.smx b/plugins/srccoop.smx
diff --git a/plugins/srccoop_addon_killsounds.smx b/plugins/srccoop_addon_killsounds.smx
diff --git a/plugins/srccoop_addon_scoring.smx b/plugins/srccoop_addon_scoring.smx
diff --git a/plugins/srccoop_addon_thirdperson.smx b/plugins/srccoop_addon_thirdperson.smx
diff --git a/scripting/include/srccoop.inc b/scripting/include/srccoop.inc
@@ -16,6 +16,7 @@
 #include <logdebug>
 
 #include <srccoop/typedef.inc>
+#include <srccoop/typedef_game.inc>
 #include <srccoop/features.inc>
 #include <srccoop/classdef.inc>
 #include <srccoop/utils.inc>

diff --git a/scripting/include/srccoop/classdef.inc b/scripting/include/srccoop/classdef.inc
@@ -5,9 +5,13 @@
 
 #include <sdktools>
 
-#define STATE_WARMUP "m_StateWarmup"
-#define STATE_ROUND "m_StateRound"
-#define STATE_INTERMISSION "m_StateIntermission"
+Handle g_pGlobalEntityGetIndex;
+Handle g_pGlobalEntityGetState;
+Handle g_pGameShutdown;
+Handle g_pSetCollisionBounds;
+Handle g_pUpdateEnemyMemory;
+Handle g_pGetSequenceLinearMotion;
+Handle g_pShouldPlayerAvoid;
 
 enum struct FireOutputData
 {
@@ -17,32 +21,6 @@ enum struct FireOutputData
 	float m_flDelay;
 }
 
-enum
-{
-	STATE_WARMUP_INDEX = 0,
-	STATE_INTERMISSION_INDEX,
-	STATE_ROUND_INDEX
-}
-
-enum
-{
-	STATE_ELEMENT_DONE_TIME = 0,
-	STATE_ELEMENT_NEXT_STATE,
-	STATE_ELEMENT_IS_IN_INTERMISSION
-}
-
-enum GLOBALESTATE
-{
-	GLOBAL_OFF = 0,
-	GLOBAL_ON = 1,
-	GLOBAL_DEAD = 2
-};
-
-Handle g_pGlobalEntityGetIndex;
-Handle g_pGlobalEntityGetState;
-
-Handle g_pGameShutdown;
-
 methodmap Array_t < ArrayList
 {
 	public Array_t(ArrayList pHandle = null)
@@ -62,11 +40,6 @@ methodmap Array_t < ArrayList
 	}
 }
 
-Handle g_pSetCollisionBounds;
-Handle g_pUpdateEnemyMemory;
-Handle g_pGetSequenceLinearMotion;
-Handle g_pShouldPlayerAvoid;
-
 public int InternalGetBaseEntity(const int iEntIndex)
 {
 	return (iEntIndex > -1) ? EntIndexToEntRef(iEntIndex) : iEntIndex;

diff --git a/scripting/include/srccoop/menu.inc b/scripting/include/srccoop/menu.inc
@@ -6,6 +6,7 @@
 TopMenu g_pCoopTopMenu;
 TopMenuObject g_pCoopPlayerSettingsMenu;
 TopMenuObject g_pCoopSoundSettingsMenu;
+TopMenuObject g_pCoopOthersMenu;
 
 public any Native_GetCoopTopMenu(Handle plugin, int numParams)
 {
@@ -19,8 +20,19 @@ void InitializeMenus()
 	RegConsoleCmd("sizeup", Command_CoopMenu, "Displays the coop menu");
 
 	g_pCoopTopMenu = new TopMenu(CoopTopMenuHandler);
-	g_pCoopPlayerSettingsMenu = g_pCoopTopMenu.AddCategory(COOPMENU_CATEGORY_SETTINGS, CoopTopMenuHandler);
-	g_pCoopSoundSettingsMenu = g_pCoopTopMenu.AddCategory(COOPMENU_CATEGORY_SOUND_SETTINGS, CoopTopMenuHandler);
+	g_pCoopPlayerSettingsMenu = g_pCoopTopMenu.AddCategory(COOPMENU_CATEGORY_PLAYER, CoopTopMenuHandler);
+	g_pCoopSoundSettingsMenu = g_pCoopTopMenu.AddCategory(COOPMENU_CATEGORY_SOUNDS, CoopTopMenuHandler);
+	g_pCoopOthersMenu = g_pCoopTopMenu.AddCategory(COOPMENU_CATEGORY_OTHER, CoopTopMenuHandler);
+
+	char path[PLATFORM_MAX_PATH];
+	char error[256];
+
+	BuildPath(Path_SM, path, sizeof(path), "configs/sourcecoop/menu_sorting.txt");
+
+	if (!g_pCoopTopMenu.LoadConfig(path, error, sizeof(error)))
+	{
+		LogError("Could not load SourceCoop menu config (file \"%s\": %s)", path, error);
+	}
 }
 
 public void CoopTopMenuHandler(TopMenu topmenu, TopMenuAction action, TopMenuObject topobj_id, int param, char[] buffer, int maxlength)
@@ -33,11 +45,15 @@ public void CoopTopMenuHandler(TopMenu topmenu, TopMenuAction action, TopMenuObj
 	{
 		if (topobj_id == g_pCoopPlayerSettingsMenu)
 		{
-			Format(buffer, maxlength, COOPMENU_CATEGORY_SETTINGS);
+			Format(buffer, maxlength, "Player settings");
 		}
 		else if (topobj_id == g_pCoopSoundSettingsMenu)
 		{
-			Format(buffer, maxlength, COOPMENU_CATEGORY_SOUND_SETTINGS);
+			Format(buffer, maxlength, "Sound settings");
+		}
+		else if (topobj_id == g_pCoopOthersMenu)
+		{
+			Format(buffer, maxlength, "Other");
 		}
 	}
 }