From: bones_was_here <bones_was_here@xonotic.au>
Date: Thu, 21 Mar 2024 00:43:18 +0000 (+1000)
Subject: Support Domination control points on QL maps
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a482b35899397da542dc5f7a94171c2ca60651c;p=xonotic%2Fxonotic-data.pk3dir.git

Support Domination control points on QL maps
---

diff --git a/qcsrc/common/gamemodes/gamemode/domination/domination.qh b/qcsrc/common/gamemodes/gamemode/domination/domination.qh
index 4ebb68425..494737c36 100644
--- a/qcsrc/common/gamemodes/gamemode/domination/domination.qh
+++ b/qcsrc/common/gamemodes/gamemode/domination/domination.qh
@@ -26,7 +26,7 @@ CLASS(Domination, Gametype)
     }
     METHOD(Domination, m_generate_mapinfo, void(Gametype this, string v))
     {
-        if(v == "dom_controlpoint")
+        if(v == "dom_controlpoint" || v == "team_dom_point")
             MapInfo_Map_supportedGametypes |= this.m_flags;
     }
     METHOD(Domination, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns))
diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
index 3c270b3ad..728915555 100644
--- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
+++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
@@ -487,6 +487,23 @@ spawnfunc(dom_controlpoint)
 	IL_PUSH(g_dompoints, this);
 }
 
+	// Quake Live CP
+/*QUAKED team_dom_point (0 .2 1) (-16 -16 0) (16 16 88)
+Domination capture point.
+-------- KEYS --------
+identifier : Set to 1, 2, or 3 to match to point 'A', 'B', or 'C'.
+count : Adjust the range of the capture point (in units, eg: 64, 128... etc).
+target : Target name for multiple info_player_deathmatch entities (to allow spawning near that particular dom point).
+-------- NOTES --------
+Do not assign a 'gametype' key to this item. It is used in all four team game types. The game will call for it as needed.
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/powerups/domination/dompoint.md3"
+*/
+spawnfunc(team_dom_point)
+{
+	spawnfunc_dom_controlpoint(this);
+}
+
 /*QUAKED spawnfunc_dom_team (0 .5 .8) (-32 -32 -24) (32 32 32)
 Team declaration for Domination gameplay, this allows you to decide what team
 names and control point models are used in your map.