From: Mario <mario@smbclan.net>
Date: Sun, 11 Aug 2019 07:21:49 +0000 (+1000)
Subject: Move most gametype's modicons functions into their directories
X-Git-Tag: xonotic-v0.8.5~1412
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3718457b0b6a72644ffdbce800a659fbf48bd70e

Move most gametype's modicons functions into their directories
---

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 9300293408..59ecb04d23 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -268,7 +268,6 @@ bool autocvar_hud_panel_infomessages_flip;
 float autocvar_hud_panel_mapvote_highlight_border = 1;
 bool autocvar_hud_panel_modicons;
 int autocvar_hud_panel_modicons_ca_layout;
-int autocvar_hud_panel_modicons_dom_layout;
 int autocvar_hud_panel_modicons_freezetag_layout;
 bool autocvar_hud_panel_notify;
 float autocvar_hud_panel_notify_fadetime;
diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index 306bb6f8a3..18ec37d47e 100644
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -9,8 +9,6 @@
 
 // Mod icons (#10)
 
-bool mod_active; // is there any active mod icon?
-
 void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i)
 {
 	TC(int, layout); TC(int, i);
@@ -84,405 +82,6 @@ void HUD_Mod_CA(vector myPos, vector mySize)
 	}
 }
 
-// CTF HUD modicon section
-int redflag_prevframe, blueflag_prevframe, yellowflag_prevframe, pinkflag_prevframe, neutralflag_prevframe; // status during previous frame
-int redflag_prevstatus, blueflag_prevstatus, yellowflag_prevstatus, pinkflag_prevstatus, neutralflag_prevstatus; // last remembered status
-float redflag_statuschange_time, blueflag_statuschange_time, yellowflag_statuschange_time, pinkflag_statuschange_time, neutralflag_statuschange_time; // time when the status changed
-
-void HUD_Mod_CTF_Reset()
-{
-	redflag_prevstatus = blueflag_prevstatus = yellowflag_prevstatus = pinkflag_prevstatus = neutralflag_prevstatus = 0;
-	redflag_prevframe = blueflag_prevframe = yellowflag_prevframe = pinkflag_prevframe = neutralflag_prevframe = 0;
-	redflag_statuschange_time = blueflag_statuschange_time = yellowflag_statuschange_time = pinkflag_statuschange_time = neutralflag_statuschange_time = 0;
-}
-
-int autocvar__teams_available;
-void HUD_Mod_CTF(vector pos, vector mySize)
-{
-	vector redflag_pos, blueflag_pos, yellowflag_pos, pinkflag_pos, neutralflag_pos;
-	vector flag_size;
-	float f; // every function should have that
-
-	int redflag, blueflag, yellowflag, pinkflag, neutralflag; // current status
-	float redflag_statuschange_elapsedtime = 0, blueflag_statuschange_elapsedtime = 0, yellowflag_statuschange_elapsedtime = 0, pinkflag_statuschange_elapsedtime = 0, neutralflag_statuschange_elapsedtime = 0; // time since the status changed
-	bool ctf_oneflag; // one-flag CTF mode enabled/disabled
-	bool ctf_stalemate; // currently in stalemate
-	int stat_items = STAT(CTF_FLAGSTATUS);
-	float fs, fs2, fs3, size1, size2;
-	vector e1, e2;
-
-	int nteams = autocvar__teams_available;
-
-	redflag = (stat_items/CTF_RED_FLAG_TAKEN) & 3;
-	blueflag = (stat_items/CTF_BLUE_FLAG_TAKEN) & 3;
-	yellowflag = (stat_items/CTF_YELLOW_FLAG_TAKEN) & 3;
-	pinkflag = (stat_items/CTF_PINK_FLAG_TAKEN) & 3;
-	neutralflag = (stat_items/CTF_NEUTRAL_FLAG_TAKEN) & 3;
-
-	ctf_oneflag = (stat_items & CTF_FLAG_NEUTRAL);
-
-	ctf_stalemate = (stat_items & CTF_STALEMATE);
-
-	mod_active = (redflag || blueflag || yellowflag || pinkflag || neutralflag || (stat_items & CTF_SHIELDED));
-
-	if (autocvar__hud_configure) {
-		redflag = 1;
-		blueflag = 2;
-		if (nteams & BIT(2))
-			yellowflag = 2;
-		if (nteams & BIT(3))
-			pinkflag = 3;
-		ctf_oneflag = neutralflag = 0; // disable neutral flag in hud editor?
-	}
-
-	// when status CHANGES, set old status into prevstatus and current status into status
-	#define X(team) MACRO_BEGIN \
-		if (team##flag != team##flag_prevframe) { \
-			team##flag_statuschange_time = time; \
-			team##flag_prevstatus = team##flag_prevframe; \
-			team##flag_prevframe = team##flag; \
-		} \
-		team##flag_statuschange_elapsedtime = time - team##flag_statuschange_time; \
-	MACRO_END
-	X(red);
-	X(blue);
-	X(yellow);
-	X(pink);
-	X(neutral);
-	#undef X
-
-	const float BLINK_FACTOR = 0.15;
-	const float BLINK_BASE = 0.85;
-	// note:
-	//   RMS = sqrt(BLINK_BASE^2 + 0.5 * BLINK_FACTOR^2)
-	// thus
-	//   BLINK_BASE = sqrt(RMS^2 - 0.5 * BLINK_FACTOR^2)
-	// ensure RMS == 1
-	const float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
-
-	#define X(team, cond) \
-	string team##_icon = string_null, team##_icon_prevstatus = string_null; \
-	int team##_alpha, team##_alpha_prevstatus; \
-	team##_alpha = team##_alpha_prevstatus = 1; \
-	MACRO_BEGIN \
-		switch (team##flag) { \
-			case 1: team##_icon = "flag_" #team "_taken"; break; \
-			case 2: team##_icon = "flag_" #team "_lost"; break; \
-			case 3: team##_icon = "flag_" #team "_carrying"; team##_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; \
-			default: \
-				if ((stat_items & CTF_SHIELDED) && (cond)) { \
-					team##_icon = "flag_" #team "_shielded"; \
-				} else { \
-					team##_icon = string_null; \
-				} \
-				break; \
-		} \
-		switch (team##flag_prevstatus) { \
-			case 1: team##_icon_prevstatus = "flag_" #team "_taken"; break; \
-			case 2: team##_icon_prevstatus = "flag_" #team "_lost"; break; \
-			case 3: team##_icon_prevstatus = "flag_" #team "_carrying"; team##_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; \
-			default: \
-				if (team##flag == 3) { \
-					team##_icon_prevstatus = "flag_" #team "_carrying"; /* make it more visible */\
-				} else if((stat_items & CTF_SHIELDED) && (cond)) { \
-					team##_icon_prevstatus = "flag_" #team "_shielded"; \
-				} else { \
-					team##_icon_prevstatus = string_null; \
-				} \
-				break; \
-		} \
-	MACRO_END
-	X(red, myteam != NUM_TEAM_1 && (nteams & BIT(0)));
-	X(blue, myteam != NUM_TEAM_2 && (nteams & BIT(1)));
-	X(yellow, myteam != NUM_TEAM_3 && (nteams & BIT(2)));
-	X(pink, myteam != NUM_TEAM_4 && (nteams & BIT(3)));
-	X(neutral, ctf_oneflag);
-	#undef X
-
-	int tcount = 2;
-	if(nteams & BIT(2))
-		tcount = 3;
-	if(nteams & BIT(3))
-		tcount = 4;
-
-	if (ctf_oneflag) {
-		// hacky, but these aren't needed
-		red_icon = red_icon_prevstatus = blue_icon = blue_icon_prevstatus = yellow_icon = yellow_icon_prevstatus = pink_icon = pink_icon_prevstatus = string_null;
-		fs = fs2 = fs3 = 1;
-	} else switch (tcount) {
-		default:
-		case 2: fs = 0.5; fs2 = 0.5; fs3 = 0.5; break;
-		case 3: fs = 1; fs2 = 0.35; fs3 = 0.35; break;
-		case 4: fs = 0.75; fs2 = 0.25; fs3 = 0.5; break;
-	}
-
-	if (mySize_x > mySize_y) {
-		size1 = mySize_x;
-		size2 = mySize_y;
-		e1 = eX;
-		e2 = eY;
-	} else {
-		size1 = mySize_y;
-		size2 = mySize_x;
-		e1 = eY;
-		e2 = eX;
-	}
-
-	switch (myteam) {
-		default:
-		case NUM_TEAM_1: {
-			redflag_pos = pos;
-			blueflag_pos = pos + eX * fs2 * size1;
-			yellowflag_pos = pos - eX * fs2 * size1;
-			pinkflag_pos = pos + eX * fs3 * size1;
-			break;
-		}
-		case NUM_TEAM_2: {
-			redflag_pos = pos + eX * fs2 * size1;
-			blueflag_pos = pos;
-			yellowflag_pos = pos - eX * fs2 * size1;
-			pinkflag_pos = pos + eX * fs3 * size1;
-			break;
-		}
-		case NUM_TEAM_3: {
-			redflag_pos = pos + eX * fs3 * size1;
-			blueflag_pos = pos - eX * fs2 * size1;
-			yellowflag_pos = pos;
-			pinkflag_pos = pos + eX * fs2 * size1;
-			break;
-		}
-		case NUM_TEAM_4: {
-			redflag_pos = pos - eX * fs2 * size1;
-			blueflag_pos = pos + eX * fs3 * size1;
-			yellowflag_pos = pos + eX * fs2 * size1;
-			pinkflag_pos = pos;
-			break;
-		}
-	}
-	neutralflag_pos = pos;
-	flag_size = e1 * fs * size1 + e2 * size2;
-
-	#define X(team) MACRO_BEGIN \
-		f = bound(0, team##flag_statuschange_elapsedtime * 2, 1); \
-		if (team##_icon && ctf_stalemate) \
-			drawpic_aspect_skin(team##flag_pos, "flag_stalemate", flag_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); \
-		if (team##_icon_prevstatus && f < 1) \
-			drawpic_aspect_skin_expanding(team##flag_pos, team##_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * team##_alpha_prevstatus, DRAWFLAG_NORMAL, f); \
-		if (team##_icon) \
-			drawpic_aspect_skin(team##flag_pos, team##_icon, flag_size, '1 1 1', panel_fg_alpha * team##_alpha * f, DRAWFLAG_NORMAL); \
-	MACRO_END
-	X(red);
-	X(blue);
-	X(yellow);
-	X(pink);
-	X(neutral);
-	#undef X
-}
-
-// Keyhunt HUD modicon section
-vector KH_SLOTS[4];
-
-void HUD_Mod_KH(vector pos, vector mySize)
-{
-	mod_active = 1; // keyhunt should never hide the mod icons panel
-
-	// Read current state
-	int state = STAT(KH_KEYS);
-	if(!state) return;
-
-	int i, key_state;
-	int all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys;
-	all_keys = team1_keys = team2_keys = team3_keys = team4_keys = dropped_keys = carrying_keys = 0;
-
-	for(i = 0; i < 4; ++i)
-	{
-		key_state = (bitshift(state, i * -5) & 31) - 1;
-
-		if(key_state == -1)
-			continue;
-
-		if(key_state == 30)
-		{
-			++carrying_keys;
-			key_state = myteam;
-		}
-
-		switch(key_state)
-		{
-			case NUM_TEAM_1: ++team1_keys; break;
-			case NUM_TEAM_2: ++team2_keys; break;
-			case NUM_TEAM_3: ++team3_keys; break;
-			case NUM_TEAM_4: ++team4_keys; break;
-			case 29: ++dropped_keys; break;
-		}
-
-		++all_keys;
-	}
-
-	// Calculate slot measurements
-	vector slot_size;
-	if(all_keys == 4 && mySize.x * 0.5 < mySize.y && mySize.y * 0.5 < mySize.x)
-	{
-		// Quadratic arrangement
-		slot_size = vec2(mySize.x * 0.5, mySize.y * 0.5);
-		KH_SLOTS[0] = pos;
-		KH_SLOTS[1] = pos + eX * slot_size.x;
-		KH_SLOTS[2] = pos + eY * slot_size.y;
-		KH_SLOTS[3] = pos + eX * slot_size.x + eY * slot_size.y;
-	}
-	else
-	{
-		if(mySize.x > mySize.y)
-		{
-			// Horizontal arrangement
-			slot_size = vec2(mySize.x / all_keys, mySize.y);
-			for(i = 0; i < all_keys; ++i)
-				KH_SLOTS[i] = pos + eX * slot_size.x * i;
-		}
-		else
-		{
-			// Vertical arrangement
-			slot_size = vec2(mySize.x, mySize.y / all_keys);
-			for(i = 0; i < all_keys; ++i)
-				KH_SLOTS[i] = pos + eY * slot_size.y * i;
-		}
-	}
-
-	// Make icons blink in case of RUN HERE
-
-	float alpha = 1;
-	if(carrying_keys)
-	{
-		float blink = 0.6 + sin(2 * M_PI * time) * 0.4; // Oscillate between 0.2 and 1
-		switch(myteam)
-		{
-			case NUM_TEAM_1: if(team1_keys == all_keys) alpha = blink; break;
-			case NUM_TEAM_2: if(team2_keys == all_keys) alpha = blink; break;
-			case NUM_TEAM_3: if(team3_keys == all_keys) alpha = blink; break;
-			case NUM_TEAM_4: if(team4_keys == all_keys) alpha = blink; break;
-		}
-	}
-
-	// Draw icons
-
-	i = 0;
-
-	while(team1_keys--)
-		if(myteam == NUM_TEAM_1 && carrying_keys)
-		{
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-			--carrying_keys;
-		}
-		else
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-	while(team2_keys--)
-		if(myteam == NUM_TEAM_2 && carrying_keys)
-		{
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-			--carrying_keys;
-		}
-		else
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-	while(team3_keys--)
-		if(myteam == NUM_TEAM_3 && carrying_keys)
-		{
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-			--carrying_keys;
-		}
-		else
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-	while(team4_keys--)
-		if(myteam == NUM_TEAM_4 && carrying_keys)
-		{
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-			--carrying_keys;
-		}
-		else
-			drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-	while(dropped_keys--)
-		drawpic_aspect_skin(KH_SLOTS[i++], "kh_dropped", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-}
-
-// Keepaway HUD mod icon
-int kaball_prevstatus; // last remembered status
-float kaball_statuschange_time; // time when the status changed
-
-// we don't need to reset for keepaway since it immediately
-// autocorrects prevstatus as to if the player has the ball or not
-
-void HUD_Mod_Keepaway(vector pos, vector mySize)
-{
-	mod_active = 1; // keepaway should always show the mod HUD
-
-	float BLINK_FACTOR = 0.15;
-	float BLINK_BASE = 0.85;
-	float BLINK_FREQ = 5;
-	float kaball_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
-
-	int stat_items = STAT(ITEMS);
-	int kaball = (stat_items/IT_KEY1) & 1;
-
-	if(kaball != kaball_prevstatus)
-	{
-		kaball_statuschange_time = time;
-		kaball_prevstatus = kaball;
-	}
-
-	vector kaball_pos, kaball_size;
-
-	if(mySize.x > mySize.y) {
-		kaball_pos = pos + eX * 0.25 * mySize.x;
-		kaball_size = vec2(0.5 * mySize.x, mySize.y);
-	} else {
-		kaball_pos = pos + eY * 0.25 * mySize.y;
-		kaball_size = vec2(mySize.x, 0.5 * mySize.y);
-	}
-
-	float kaball_statuschange_elapsedtime = time - kaball_statuschange_time;
-	float f = bound(0, kaball_statuschange_elapsedtime*2, 1);
-
-	if(kaball_prevstatus && f < 1)
-		drawpic_aspect_skin_expanding(kaball_pos, "keepawayball_carrying", kaball_size, '1 1 1', panel_fg_alpha * kaball_alpha, DRAWFLAG_NORMAL, f);
-
-	if(kaball)
-		drawpic_aspect_skin(pos, "keepawayball_carrying", vec2(mySize.x, mySize.y), '1 1 1', panel_fg_alpha * kaball_alpha * f, DRAWFLAG_NORMAL);
-}
-
-
-// Nexball HUD mod icon
-void HUD_Mod_NexBall(vector pos, vector mySize)
-{
-	float nb_pb_starttime, dt, p;
-	int stat_items;
-
-	stat_items = STAT(ITEMS);
-	nb_pb_starttime = STAT(NB_METERSTART);
-
-	if (stat_items & IT_KEY1)
-		mod_active = 1;
-	else
-		mod_active = 0;
-
-	//Manage the progress bar if any
-	if (nb_pb_starttime > 0)
-	{
-		dt = (time - nb_pb_starttime) % nb_pb_period;
-		// one period of positive triangle
-		p = 2 * dt / nb_pb_period;
-		if (p > 1)
-			p = 2 - p;
-
-		HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, (mySize.x <= mySize.y), 0, autocvar_hud_progressbar_nexball_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-	}
-
-	if (stat_items & IT_KEY1)
-		drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
 // Race/CTS HUD mod icons
 float crecordtime_prev; // last remembered crecordtime
 float crecordtime_change_time; // time when crecordtime last changed
@@ -629,87 +228,6 @@ void HUD_Mod_Race(vector pos, vector mySize)
 	}
 }
 
-void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i)
-{
-	TC(int, layout); TC(int, i);
-	float stat = -1;
-	string pic = "";
-	vector color = '0 0 0';
-	switch(i)
-	{
-		case 0: stat = STAT(DOM_PPS_RED); pic = "dom_icon_red"; color = '1 0 0'; break;
-		case 1: stat = STAT(DOM_PPS_BLUE); pic = "dom_icon_blue"; color = '0 0 1'; break;
-		case 2: stat = STAT(DOM_PPS_YELLOW); pic = "dom_icon_yellow"; color = '1 1 0'; break;
-		default:
-		case 3: stat = STAT(DOM_PPS_PINK); pic = "dom_icon_pink"; color = '1 0 1'; break;
-	}
-	float pps_ratio = 0;
-	if(STAT(DOM_TOTAL_PPS))
-		pps_ratio = stat / STAT(DOM_TOTAL_PPS);
-
-	if(mySize.x/mySize.y > aspect_ratio)
-	{
-		i = aspect_ratio * mySize.y;
-		myPos.x = myPos.x + (mySize.x - i) / 2;
-		mySize.x = i;
-	}
-	else
-	{
-		i = 1/aspect_ratio * mySize.x;
-		myPos.y = myPos.y + (mySize.y - i) / 2;
-		mySize.y = i;
-	}
-
-	if (layout) // show text too
-	{
-		//draw the text
-		color *= 0.5 + pps_ratio * (1 - 0.5); // half saturated color at min, full saturated at max
-		if (layout == 2) // average pps
-			drawstring_aspect(myPos + eX * mySize.y, ftos_decimals(stat, 2), vec2((2/3) * mySize.x, mySize.y), color, panel_fg_alpha, DRAWFLAG_NORMAL);
-		else // percentage of average pps
-			drawstring_aspect(myPos + eX * mySize.y, strcat( ftos(floor(pps_ratio*100 + 0.5)), "%" ), vec2((2/3) * mySize.x, mySize.y), color, panel_fg_alpha, DRAWFLAG_NORMAL);
-	}
-
-	//draw the icon
-	drawpic_aspect_skin(myPos, pic, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-	if (stat > 0)
-	{
-		drawsetcliparea(myPos.x, myPos.y + mySize.y * (1 - pps_ratio), mySize.y, mySize.y * pps_ratio);
-		drawpic_aspect_skin(myPos, strcat(pic, "-highlighted"), '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawresetcliparea();
-	}
-}
-
-void HUD_Mod_Dom(vector myPos, vector mySize)
-{
-	mod_active = 1; // required in each mod function that always shows something
-
-	int layout = autocvar_hud_panel_modicons_dom_layout;
-	int rows, columns;
-	float aspect_ratio;
-	aspect_ratio = (layout) ? 3 : 1;
-	rows = HUD_GetRowCount(team_count, mySize, aspect_ratio);
-	columns = ceil(team_count/rows);
-
-	int i;
-	float row = 0, column = 0;
-	vector pos, itemSize;
-	itemSize = vec2(mySize.x / columns, mySize.y / rows);
-	for(i=0; i<team_count; ++i)
-	{
-		pos = myPos + vec2(column * itemSize.x, row * itemSize.y);
-
-		DrawDomItem(pos, itemSize, aspect_ratio, layout, i);
-
-		++row;
-		if(row >= rows)
-		{
-			row = 0;
-			++column;
-		}
-	}
-}
-
 void HUD_ModIcons_SetFunc()
 {
 	HUD_ModIcons_GameType = gametype.m_modicons;
diff --git a/qcsrc/client/hud/panel/modicons.qh b/qcsrc/client/hud/panel/modicons.qh
index 6db88c68b3..c90c0991f5 100644
--- a/qcsrc/client/hud/panel/modicons.qh
+++ b/qcsrc/client/hud/panel/modicons.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "../panel.qh"
+
+bool mod_active; // is there any active mod icon?
diff --git a/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh b/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh
index e7fcea7bcf..9a1d181193 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh
@@ -1,5 +1,8 @@
 // generated file; do not modify
 #include <common/gamemodes/gamemode/ctf/ctf.qh>
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/ctf/cl_ctf.qh>
+#endif
 #ifdef SVQC
     #include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/domination/_mod.qh b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
index 0c5e841214..b48a0a9147 100644
--- a/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
@@ -1,4 +1,7 @@
 // generated file; do not modify
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/domination/cl_domination.qh>
+#endif
 #ifdef SVQC
     #include <common/gamemodes/gamemode/domination/sv_domination.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
index 145ca49f0a..8536675f3f 100644
--- a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
@@ -1,4 +1,7 @@
 // generated file; do not modify
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/keepaway/cl_keepaway.qh>
+#endif
 #ifdef SVQC
     #include <common/gamemodes/gamemode/keepaway/sv_keepaway.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
index 4f44840c41..14802494b9 100644
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
@@ -1,4 +1,7 @@
 // generated file; do not modify
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc>
+#endif
 #ifdef SVQC
     #include <common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
index e4143fc84c..defda74978 100644
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
@@ -1,4 +1,7 @@
 // generated file; do not modify
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/keyhunt/cl_keyhunt.qh>
+#endif
 #ifdef SVQC
     #include <common/gamemodes/gamemode/keyhunt/sv_keyhunt.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
index 7872767563..b229dcdf50 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
@@ -1,5 +1,10 @@
 // generated file; do not modify
-#include <common/gamemodes/gamemode/nexball/nexball.qc>
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/nexball/cl_nexball.qc>
+#endif
+#ifdef SVQC
+    #include <common/gamemodes/gamemode/nexball/sv_nexball.qc>
+#endif
 #include <common/gamemodes/gamemode/nexball/weapon.qc>
 #ifdef SVQC
     #include <common/gamemodes/gamemode/nexball/sv_weapon.qc>
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
index a1cf544371..0a3d1e2383 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
@@ -1,5 +1,10 @@
 // generated file; do not modify
-#include <common/gamemodes/gamemode/nexball/nexball.qh>
+#ifdef CSQC
+    #include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
+#endif
+#ifdef SVQC
+    #include <common/gamemodes/gamemode/nexball/sv_nexball.qh>
+#endif
 #include <common/gamemodes/gamemode/nexball/weapon.qh>
 #ifdef SVQC
     #include <common/gamemodes/gamemode/nexball/sv_weapon.qh>