From cd4f4226492c148756d24b0bb46fdd8d23d41234 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 10 Jun 2018 16:21:04 +1000 Subject: [PATCH] Move all the remaining gamemodes to common --- qcsrc/client/hud/hud.qc | 2 +- qcsrc/client/hud/panel/modicons.qc | 2 +- qcsrc/common/ent_cs.qc | 1 + qcsrc/common/gamemodes/gamemode/_mod.inc | 13 +++ qcsrc/common/gamemodes/gamemode/_mod.qh | 13 +++ .../gamemodes/gamemode/assault/_mod.inc | 2 + .../common/gamemodes/gamemode/assault/_mod.qh | 2 + .../gamemodes/gamemode/assault/assault.qc} | 7 +- .../gamemodes/gamemode/assault/assault.qh} | 4 +- .../gamemodes/gamemode/clanarena/_mod.inc | 2 + .../gamemodes/gamemode/clanarena/_mod.qh | 2 + .../gamemode/clanarena/clanarena.qc} | 5 +- .../gamemode/clanarena/clanarena.qh} | 5 +- qcsrc/common/gamemodes/gamemode/ctf/_mod.inc | 2 + qcsrc/common/gamemodes/gamemode/ctf/_mod.qh | 2 + .../gamemodes/gamemode/ctf/ctf.qc} | 5 +- .../gamemodes/gamemode/ctf/ctf.qh} | 2 - qcsrc/common/gamemodes/gamemode/cts/_mod.inc | 2 + qcsrc/common/gamemodes/gamemode/cts/_mod.qh | 2 + .../gamemodes/gamemode/cts/cts.qc} | 5 +- .../gamemodes/gamemode/cts/cts.qh} | 4 +- .../gamemodes/gamemode/deathmatch/_mod.inc | 2 + .../gamemodes/gamemode/deathmatch/_mod.qh | 2 + .../gamemode/deathmatch/deathmatch.qc} | 5 +- .../gamemode/deathmatch/deathmatch.qh} | 5 +- .../gamemodes/gamemode/domination/_mod.inc | 2 + .../gamemodes/gamemode/domination/_mod.qh | 2 + .../gamemode/domination/domination.qc} | 5 +- .../gamemode/domination/domination.qh} | 5 +- .../gamemodes/gamemode/freezetag/_mod.inc | 2 + .../gamemodes/gamemode/freezetag/_mod.qh | 2 + .../gamemode/freezetag/freezetag.qc} | 5 +- .../gamemode/freezetag/freezetag.qh} | 5 +- .../gamemodes/gamemode/invasion/_mod.inc | 2 + .../gamemodes/gamemode/invasion/_mod.qh | 2 + .../gamemodes/gamemode/invasion/invasion.qc} | 8 +- .../gamemodes/gamemode/invasion/invasion.qh} | 5 +- .../gamemodes/gamemode/keepaway/_mod.inc | 2 + .../gamemodes/gamemode/keepaway/_mod.qh | 2 + .../gamemodes/gamemode/keepaway/keepaway.qc} | 5 +- .../gamemodes/gamemode/keepaway/keepaway.qh} | 5 +- .../gamemodes/gamemode/keyhunt/_mod.inc | 2 + .../common/gamemodes/gamemode/keyhunt/_mod.qh | 2 + .../gamemodes/gamemode/keyhunt/keyhunt.qc} | 5 +- .../gamemodes/gamemode/keyhunt/keyhunt.qh} | 5 +- qcsrc/common/gamemodes/gamemode/lms/_mod.inc | 2 + qcsrc/common/gamemodes/gamemode/lms/_mod.qh | 2 + .../gamemodes/gamemode/lms/lms.qc} | 4 +- .../gamemodes/gamemode/lms/lms.qh} | 5 +- qcsrc/common/gamemodes/gamemode/race/_mod.inc | 2 + qcsrc/common/gamemodes/gamemode/race/_mod.qh | 2 + .../gamemodes/gamemode/race/race.qc} | 5 +- .../gamemodes/gamemode/race/race.qh} | 5 +- qcsrc/common/gamemodes/gamemode/tdm/_mod.inc | 2 + qcsrc/common/gamemodes/gamemode/tdm/_mod.qh | 2 + .../gamemodes/gamemode/tdm/tdm.qc} | 6 +- .../gamemodes/gamemode/tdm/tdm.qh} | 5 +- qcsrc/common/gamemodes/sv_rules.qh | 4 + qcsrc/common/monsters/sv_spawner.qh | 2 + qcsrc/server/client.qc | 1 + qcsrc/server/command/cmd.qc | 1 + qcsrc/server/command/sv_cmd.qc | 1 + qcsrc/server/command/vote.qc | 1 + qcsrc/server/mutators/_mod.inc | 2 - qcsrc/server/mutators/_mod.qh | 2 - qcsrc/server/mutators/gamemode.qh | 109 ------------------ qcsrc/server/mutators/mutator.qh | 34 ------ qcsrc/server/mutators/mutator/_mod.inc | 14 --- qcsrc/server/mutators/mutator/_mod.qh | 14 --- qcsrc/server/teamplay.qc | 2 +- 70 files changed, 182 insertions(+), 218 deletions(-) create mode 100644 qcsrc/common/gamemodes/gamemode/assault/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/assault/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_assault.qc => common/gamemodes/gamemode/assault/assault.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_assault.qh => common/gamemodes/gamemode/assault/assault.qh} (95%) create mode 100644 qcsrc/common/gamemodes/gamemode/clanarena/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/clanarena/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_ca.qc => common/gamemodes/gamemode/clanarena/clanarena.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_ca.qh => common/gamemodes/gamemode/clanarena/clanarena.qh} (94%) create mode 100644 qcsrc/common/gamemodes/gamemode/ctf/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/ctf/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_ctf.qc => common/gamemodes/gamemode/ctf/ctf.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_ctf.qh => common/gamemodes/gamemode/ctf/ctf.qh} (99%) create mode 100644 qcsrc/common/gamemodes/gamemode/cts/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/cts/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_cts.qc => common/gamemodes/gamemode/cts/cts.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_cts.qh => common/gamemodes/gamemode/cts/cts.qh} (86%) create mode 100644 qcsrc/common/gamemodes/gamemode/deathmatch/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/deathmatch/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_deathmatch.qc => common/gamemodes/gamemode/deathmatch/deathmatch.qc} (59%) rename qcsrc/{server/mutators/mutator/gamemode_deathmatch.qh => common/gamemodes/gamemode/deathmatch/deathmatch.qh} (59%) create mode 100644 qcsrc/common/gamemodes/gamemode/domination/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/domination/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_domination.qc => common/gamemodes/gamemode/domination/domination.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_domination.qh => common/gamemodes/gamemode/domination/domination.qh} (95%) create mode 100644 qcsrc/common/gamemodes/gamemode/freezetag/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/freezetag/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_freezetag.qc => common/gamemodes/gamemode/freezetag/freezetag.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_freezetag.qh => common/gamemodes/gamemode/freezetag/freezetag.qh} (94%) create mode 100644 qcsrc/common/gamemodes/gamemode/invasion/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/invasion/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_invasion.qc => common/gamemodes/gamemode/invasion/invasion.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_invasion.qh => common/gamemodes/gamemode/invasion/invasion.qh} (95%) create mode 100644 qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_keepaway.qc => common/gamemodes/gamemode/keepaway/keepaway.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_keepaway.qh => common/gamemodes/gamemode/keepaway/keepaway.qh} (90%) create mode 100644 qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_keyhunt.qc => common/gamemodes/gamemode/keyhunt/keyhunt.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_keyhunt.qh => common/gamemodes/gamemode/keyhunt/keyhunt.qh} (93%) create mode 100644 qcsrc/common/gamemodes/gamemode/lms/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/lms/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_lms.qc => common/gamemodes/gamemode/lms/lms.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_lms.qh => common/gamemodes/gamemode/lms/lms.qh} (93%) create mode 100644 qcsrc/common/gamemodes/gamemode/race/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/race/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_race.qc => common/gamemodes/gamemode/race/race.qc} (99%) rename qcsrc/{server/mutators/mutator/gamemode_race.qh => common/gamemodes/gamemode/race/race.qh} (77%) create mode 100644 qcsrc/common/gamemodes/gamemode/tdm/_mod.inc create mode 100644 qcsrc/common/gamemodes/gamemode/tdm/_mod.qh rename qcsrc/{server/mutators/mutator/gamemode_tdm.qc => common/gamemodes/gamemode/tdm/tdm.qc} (95%) rename qcsrc/{server/mutators/mutator/gamemode_tdm.qh => common/gamemodes/gamemode/tdm/tdm.qh} (90%) delete mode 100644 qcsrc/server/mutators/gamemode.qh delete mode 100644 qcsrc/server/mutators/mutator.qh delete mode 100644 qcsrc/server/mutators/mutator/_mod.inc delete mode 100644 qcsrc/server/mutators/mutator/_mod.qh diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 01799caccc..55d7ffeaa8 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -16,7 +16,7 @@ #include #include #include -#include // TODO: remove +#include /* diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index 0bbcb41484..89b8a8c188 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -5,7 +5,7 @@ #include #include #include -#include // TODO: remove +#include // Mod icons (#10) diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 0eeddc349b..bbca691add 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -1,4 +1,5 @@ #include "ent_cs.qh" +#include REGISTRY(EntCSProps, BITS(16) - 1) #define EntCSProps_from(i) _EntCSProps_from(i, NULL) diff --git a/qcsrc/common/gamemodes/gamemode/_mod.inc b/qcsrc/common/gamemodes/gamemode/_mod.inc index 2fc2c40467..c4cd002c78 100644 --- a/qcsrc/common/gamemodes/gamemode/_mod.inc +++ b/qcsrc/common/gamemodes/gamemode/_mod.inc @@ -1,4 +1,17 @@ // generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include diff --git a/qcsrc/common/gamemodes/gamemode/_mod.qh b/qcsrc/common/gamemodes/gamemode/_mod.qh index d799570126..d7c1aa66cc 100644 --- a/qcsrc/common/gamemodes/gamemode/_mod.qh +++ b/qcsrc/common/gamemodes/gamemode/_mod.qh @@ -1,4 +1,17 @@ // generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include diff --git a/qcsrc/common/gamemodes/gamemode/assault/_mod.inc b/qcsrc/common/gamemodes/gamemode/assault/_mod.inc new file mode 100644 index 0000000000..1deb03156c --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/assault/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/assault/_mod.qh b/qcsrc/common/gamemodes/gamemode/assault/_mod.qh new file mode 100644 index 0000000000..38b426d4ae --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/assault/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/common/gamemodes/gamemode/assault/assault.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_assault.qc rename to qcsrc/common/gamemodes/gamemode/assault/assault.qc index d43dc99993..ba3d996d16 100644 --- a/qcsrc/server/mutators/mutator/gamemode_assault.qc +++ b/qcsrc/common/gamemodes/gamemode/assault/assault.qc @@ -1,7 +1,7 @@ -#include "gamemode_assault.qh" - -#include +#include "assault.qh" +// TODO: split into sv_assault +#ifdef SVQC .entity sprite; #define AS_ROUND_DELAY 5 @@ -625,3 +625,4 @@ MUTATOR_HOOKFUNCTION(as, ReadyRestart_Deny) // readyrestart not supported (yet) return true; } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qh b/qcsrc/common/gamemodes/gamemode/assault/assault.qh similarity index 95% rename from qcsrc/server/mutators/mutator/gamemode_assault.qh rename to qcsrc/common/gamemodes/gamemode/assault/assault.qh index 15d3a65ad1..dd008b43e3 100644 --- a/qcsrc/server/mutators/mutator/gamemode_assault.qh +++ b/qcsrc/common/gamemodes/gamemode/assault/assault.qh @@ -1,6 +1,7 @@ #pragma once -#include "../gamemode.qh" +#ifdef SVQC +#include const int ASSAULT_VALUE_INACTIVE = 1000; @@ -43,3 +44,4 @@ void(entity this, float ratingscale, vector org, float sradius) havocbot_goalrat // predefined spawnfuncs void target_objective_decrease_activate(entity this); +#endif diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/_mod.inc b/qcsrc/common/gamemodes/gamemode/clanarena/_mod.inc new file mode 100644 index 0000000000..57dc9b3dd3 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/clanarena/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/_mod.qh b/qcsrc/common/gamemodes/gamemode/clanarena/_mod.qh new file mode 100644 index 0000000000..66f23740af --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/clanarena/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_ca.qc rename to qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc index 176661ac98..561129c7db 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ca.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc @@ -1,5 +1,7 @@ -#include "gamemode_ca.qh" +#include "clanarena.qh" +// TODO: split into sv_clanarena +#ifdef SVQC float autocvar_g_ca_damage2score_multiplier; bool autocvar_g_ca_spectate_enemies; @@ -486,3 +488,4 @@ MUTATOR_HOOKFUNCTION(ca, SetWeaponArena) // most weapons arena if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "") M_ARGV(0, string) = "most"; } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qh b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh similarity index 94% rename from qcsrc/server/mutators/mutator/gamemode_ca.qh rename to qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh index 0982fcca8f..ef475bc860 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ca.qh +++ b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh @@ -1,6 +1,8 @@ #pragma once -#include "../gamemode.qh" +#ifdef SVQC +#include +#include int autocvar_g_ca_point_limit; int autocvar_g_ca_point_leadlimit; @@ -50,3 +52,4 @@ REGISTER_MUTATOR(ca, false) // should be removed in the future, as other code should not have to care .float caplayer; // 0.5 if scheduled to join the next round +#endif diff --git a/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc b/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc new file mode 100644 index 0000000000..dcd813569f --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh b/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh new file mode 100644 index 0000000000..c1ddd9731c --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/ctf/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_ctf.qc rename to qcsrc/common/gamemodes/gamemode/ctf/ctf.qc index 1847473cf9..9382c9d8d7 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc @@ -1,5 +1,7 @@ -#include "gamemode_ctf.qh" +#include "ctf.qh" +// TODO: split into sv_ctf +#ifdef SVQC #include #include #include @@ -2774,3 +2776,4 @@ void ctf_Initialize() InitializeEntity(NULL, ctf_DelayedInit, INITPRIO_GAMETYPE); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qh b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_ctf.qh rename to qcsrc/common/gamemodes/gamemode/ctf/ctf.qh index 14bf281e71..74a3993e35 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qh +++ b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qh @@ -2,8 +2,6 @@ #ifdef SVQC -#include "../gamemode.qh" - void ctf_Initialize(); REGISTER_MUTATOR(ctf, false) diff --git a/qcsrc/common/gamemodes/gamemode/cts/_mod.inc b/qcsrc/common/gamemodes/gamemode/cts/_mod.inc new file mode 100644 index 0000000000..ab0d8a4774 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/cts/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/cts/_mod.qh b/qcsrc/common/gamemodes/gamemode/cts/_mod.qh new file mode 100644 index 0000000000..a20b5c375b --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/cts/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/cts.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_cts.qc rename to qcsrc/common/gamemodes/gamemode/cts/cts.qc index 87830db486..12319c26cd 100644 --- a/qcsrc/server/mutators/mutator/gamemode_cts.qc +++ b/qcsrc/common/gamemodes/gamemode/cts/cts.qc @@ -1,5 +1,7 @@ -#include "gamemode_cts.qh" +#include "cts.qh" +// TODO: split into sv_cts +#ifdef SVQC #include #include @@ -430,3 +432,4 @@ void cts_Initialize() { cts_ScoreRules(); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qh b/qcsrc/common/gamemodes/gamemode/cts/cts.qh similarity index 86% rename from qcsrc/server/mutators/mutator/gamemode_cts.qh rename to qcsrc/common/gamemodes/gamemode/cts/cts.qh index c90919e6f4..516e903a92 100644 --- a/qcsrc/server/mutators/mutator/gamemode_cts.qh +++ b/qcsrc/common/gamemodes/gamemode/cts/cts.qh @@ -1,6 +1,7 @@ #pragma once -#include "../gamemode.qh" +#ifdef SVQC +#include #include void cts_Initialize(); @@ -22,3 +23,4 @@ REGISTER_MUTATOR(cts, false) // scores const float ST_CTS_LAPS = 1; +#endif diff --git a/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.inc b/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.inc new file mode 100644 index 0000000000..2403aad758 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.qh b/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.qh new file mode 100644 index 0000000000..2135ec9d82 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/deathmatch/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_deathmatch.qc b/qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qc similarity index 59% rename from qcsrc/server/mutators/mutator/gamemode_deathmatch.qc rename to qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qc index 9590027d3f..5cd7ca1f52 100644 --- a/qcsrc/server/mutators/mutator/gamemode_deathmatch.qc +++ b/qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qc @@ -1,7 +1,10 @@ -#include "gamemode_deathmatch.qh" +#include "deathmatch.qh" +// TODO: sv_deathmatch? +#ifdef SVQC MUTATOR_HOOKFUNCTION(dm, Scores_CountFragsRemaining) { // announce remaining frags return true; } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_deathmatch.qh b/qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qh similarity index 59% rename from qcsrc/server/mutators/mutator/gamemode_deathmatch.qh rename to qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qh index f45b0800f3..fdae27863f 100644 --- a/qcsrc/server/mutators/mutator/gamemode_deathmatch.qh +++ b/qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qh @@ -1,9 +1,10 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include REGISTER_MUTATOR(dm, false) { MUTATOR_STATIC(); return 0; } +#endif diff --git a/qcsrc/common/gamemodes/gamemode/domination/_mod.inc b/qcsrc/common/gamemodes/gamemode/domination/_mod.inc new file mode 100644 index 0000000000..95d00b3891 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/domination/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/domination/_mod.qh b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh new file mode 100644 index 0000000000..e57c30efec --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/domination.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_domination.qc rename to qcsrc/common/gamemodes/gamemode/domination/domination.qc index 38ef58b6c5..3faa4a89a8 100644 --- a/qcsrc/server/mutators/mutator/gamemode_domination.qc +++ b/qcsrc/common/gamemodes/gamemode/domination/domination.qc @@ -1,5 +1,7 @@ -#include "gamemode_domination.qh" +#include "domination.qh" +// TODO: sv_domination +#ifdef SVQC #include bool g_domination; @@ -668,3 +670,4 @@ void dom_Initialize() g_domination = true; InitializeEntity(NULL, dom_DelayedInit, INITPRIO_GAMETYPE); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qh b/qcsrc/common/gamemodes/gamemode/domination/domination.qh similarity index 95% rename from qcsrc/server/mutators/mutator/gamemode_domination.qh rename to qcsrc/common/gamemodes/gamemode/domination/domination.qh index 95311c98a3..f4faf50a49 100644 --- a/qcsrc/server/mutators/mutator/gamemode_domination.qh +++ b/qcsrc/common/gamemodes/gamemode/domination/domination.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include #define autocvar_g_domination_point_limit cvar("g_domination_point_limit") bool autocvar_g_domination_roundbased; int autocvar_g_domination_roundbased_point_limit; @@ -51,3 +51,4 @@ void AnimateDomPoint(entity this); IntrusiveList g_dompoints; STATIC_INIT(g_dompoints) { g_dompoints = IL_NEW(); } +#endif diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/_mod.inc b/qcsrc/common/gamemodes/gamemode/freezetag/_mod.inc new file mode 100644 index 0000000000..aff5bf9d7b --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/freezetag/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/_mod.qh b/qcsrc/common/gamemodes/gamemode/freezetag/_mod.qh new file mode 100644 index 0000000000..1bc21821a7 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/freezetag/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_freezetag.qc rename to qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc index 36546c43a0..cceff4806c 100644 --- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc @@ -1,5 +1,7 @@ -#include "gamemode_freezetag.qh" +#include "freezetag.qh" +// TODO: sv_freezetag +#ifdef SVQC float autocvar_g_freezetag_frozen_maxtime; float autocvar_g_freezetag_revive_clearspeed; float autocvar_g_freezetag_round_timelimit; @@ -583,3 +585,4 @@ void freezetag_Initialize() EliminatedPlayers_Init(freezetag_isEliminated); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh similarity index 94% rename from qcsrc/server/mutators/mutator/gamemode_freezetag.qh rename to qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh index a258d82eab..ed38ae50a9 100644 --- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qh +++ b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include int autocvar_g_freezetag_point_limit; int autocvar_g_freezetag_point_leadlimit; bool autocvar_g_freezetag_team_spawns; @@ -34,3 +34,4 @@ float autocvar_g_freezetag_revive_extra_size; float autocvar_g_freezetag_revive_speed; bool autocvar_g_freezetag_revive_nade; float autocvar_g_freezetag_revive_nade_health; +#endif diff --git a/qcsrc/common/gamemodes/gamemode/invasion/_mod.inc b/qcsrc/common/gamemodes/gamemode/invasion/_mod.inc new file mode 100644 index 0000000000..905aa0611b --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/invasion/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/invasion/_mod.qh b/qcsrc/common/gamemodes/gamemode/invasion/_mod.qh new file mode 100644 index 0000000000..d8e8d223da --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/invasion/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_invasion.qc rename to qcsrc/common/gamemodes/gamemode/invasion/invasion.qc index 777b1b1e97..d6f9860c98 100644 --- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc +++ b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc @@ -1,6 +1,9 @@ -#include "gamemode_invasion.qh" +#include "invasion.qh" +// TODO: sv_invasion +#ifdef SVQC #include +#include #include #include @@ -27,8 +30,6 @@ bool victent_present; bool inv_warning_shown; // spammy -.string spawnmob; - void target_invasion_roundend_use(entity this, entity actor, entity trigger) { if(!IS_PLAYER(actor)) { return; } @@ -602,3 +603,4 @@ void invasion_Initialize() { InitializeEntity(NULL, invasion_DelayedInit, INITPRIO_GAMETYPE); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qh b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qh similarity index 95% rename from qcsrc/server/mutators/mutator/gamemode_invasion.qh rename to qcsrc/common/gamemodes/gamemode/invasion/invasion.qh index 0ea0e82c4c..85cd7ec09a 100644 --- a/qcsrc/server/mutators/mutator/gamemode_invasion.qh +++ b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include #define autocvar_g_invasion_point_limit cvar("g_invasion_point_limit") int autocvar_g_invasion_teams; int autocvar_g_invasion_type; @@ -45,3 +45,4 @@ const float ST_INV_KILLS = 1; const int INV_TYPE_ROUND = 0; // round-based waves of enemies const int INV_TYPE_HUNT = 1; // clear the map of placed enemies const int INV_TYPE_STAGE = 2; // reach the end of the level +#endif diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc new file mode 100644 index 0000000000..9426d78074 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh new file mode 100644 index 0000000000..32872a2a6b --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_keepaway.qc rename to qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc index 567f24b478..8eb88a3bb7 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc +++ b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc @@ -1,5 +1,7 @@ -#include "gamemode_keepaway.qh" +#include "keepaway.qh" +// TODO: keepaway +#ifdef SVQC #include .entity ballcarried; @@ -470,3 +472,4 @@ void ka_Initialize() // run at the start of a match, initiates game mode { ka_SpawnBall(); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qh b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh similarity index 90% rename from qcsrc/server/mutators/mutator/gamemode_keepaway.qh rename to qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh index abbabbd5bb..187d115e37 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qh +++ b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include void ka_Initialize(); REGISTER_MUTATOR(ka, false) @@ -27,3 +27,4 @@ void(entity this) havocbot_role_ka_carrier; void(entity this) havocbot_role_ka_collector; void ka_DropEvent(entity plyr); +#endif diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc new file mode 100644 index 0000000000..3861dea006 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh new file mode 100644 index 0000000000..cd796c7ef9 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_keyhunt.qc rename to qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc index 04576486b7..6523612e23 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc @@ -1,5 +1,7 @@ -#include "gamemode_keyhunt.qh" +#include "keyhunt.qh" +// TODO: sv_keyhunt +#ifdef SVQC float autocvar_g_balance_keyhunt_damageforcescale; float autocvar_g_balance_keyhunt_delay_collect; float autocvar_g_balance_keyhunt_delay_damage_return; @@ -1319,3 +1321,4 @@ MUTATOR_HOOKFUNCTION(kh, reset_map_global) { kh_WaitForPlayers(); // takes care of killing the "missing teams" message } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh similarity index 93% rename from qcsrc/server/mutators/mutator/gamemode_keyhunt.qh rename to qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh index 77d7c06fcf..a086ee689e 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include #define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit") int autocvar_g_keyhunt_point_leadlimit; bool autocvar_g_keyhunt_team_spawns; @@ -33,3 +33,4 @@ bool kh_tracking_enabled; USING(kh_Think_t, void()); void kh_StartRound(); void kh_Controller_SetThink(float t, kh_Think_t func); +#endif diff --git a/qcsrc/common/gamemodes/gamemode/lms/_mod.inc b/qcsrc/common/gamemodes/gamemode/lms/_mod.inc new file mode 100644 index 0000000000..43bb76d7fa --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/lms/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/lms/_mod.qh b/qcsrc/common/gamemodes/gamemode/lms/_mod.qh new file mode 100644 index 0000000000..5e780bb674 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/lms/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/lms.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_lms.qc rename to qcsrc/common/gamemodes/gamemode/lms/lms.qc index a57b2ae2d0..5e97248c6f 100644 --- a/qcsrc/server/mutators/mutator/gamemode_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/lms.qc @@ -1,5 +1,6 @@ -#include "gamemode_lms.qh" +#include "lms.qh" +#ifdef SVQC #include #include #include @@ -427,3 +428,4 @@ void lms_Initialize() { lms_lowest_lives = 9999; } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qh b/qcsrc/common/gamemodes/gamemode/lms/lms.qh similarity index 93% rename from qcsrc/server/mutators/mutator/gamemode_lms.qh rename to qcsrc/common/gamemodes/gamemode/lms/lms.qh index c69113a0c2..fbb837b0cf 100644 --- a/qcsrc/server/mutators/mutator/gamemode_lms.qh +++ b/qcsrc/common/gamemodes/gamemode/lms/lms.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include .float lms_spectate_warning; #define autocvar_g_lms_lives_override cvar("g_lms_lives_override") void lms_Initialize(); @@ -27,3 +27,4 @@ REGISTER_MUTATOR(lms, false) // lives related defs float lms_lowest_lives; float LMS_NewPlayerLives(); +#endif diff --git a/qcsrc/common/gamemodes/gamemode/race/_mod.inc b/qcsrc/common/gamemodes/gamemode/race/_mod.inc new file mode 100644 index 0000000000..73f34a5833 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/race/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/race/_mod.qh b/qcsrc/common/gamemodes/gamemode/race/_mod.qh new file mode 100644 index 0000000000..1158df5616 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/race/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/common/gamemodes/gamemode/race/race.qc similarity index 99% rename from qcsrc/server/mutators/mutator/gamemode_race.qc rename to qcsrc/common/gamemodes/gamemode/race/race.qc index 65541fc086..c98e1b6a89 100644 --- a/qcsrc/server/mutators/mutator/gamemode_race.qc +++ b/qcsrc/common/gamemodes/gamemode/race/race.qc @@ -1,5 +1,7 @@ -#include "gamemode_race.qh" +#include "race.qh" +// TODO: sv_race +#ifdef SVQC #include #define autocvar_g_race_laps_limit cvar("g_race_laps_limit") @@ -487,3 +489,4 @@ void rc_SetLimits() GameRules_limit_time(timelimit_override); GameRules_limit_time_qualifying(qualifying_override); } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qh b/qcsrc/common/gamemodes/gamemode/race/race.qh similarity index 77% rename from qcsrc/server/mutators/mutator/gamemode_race.qh rename to qcsrc/common/gamemodes/gamemode/race/race.qh index 1e475e3ce6..ad966af72c 100644 --- a/qcsrc/server/mutators/mutator/gamemode_race.qh +++ b/qcsrc/common/gamemodes/gamemode/race/race.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include void rc_SetLimits(); void race_Initialize(); @@ -16,3 +16,4 @@ REGISTER_MUTATOR(rc, false) } return 0; } +#endif diff --git a/qcsrc/common/gamemodes/gamemode/tdm/_mod.inc b/qcsrc/common/gamemodes/gamemode/tdm/_mod.inc new file mode 100644 index 0000000000..ef7137a004 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tdm/_mod.inc @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/common/gamemodes/gamemode/tdm/_mod.qh b/qcsrc/common/gamemodes/gamemode/tdm/_mod.qh new file mode 100644 index 0000000000..f1965c1095 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tdm/_mod.qh @@ -0,0 +1,2 @@ +// generated file; do not modify +#include diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qc b/qcsrc/common/gamemodes/gamemode/tdm/tdm.qc similarity index 95% rename from qcsrc/server/mutators/mutator/gamemode_tdm.qc rename to qcsrc/common/gamemodes/gamemode/tdm/tdm.qc index aad3193288..39e5fec1e1 100644 --- a/qcsrc/server/mutators/mutator/gamemode_tdm.qc +++ b/qcsrc/common/gamemodes/gamemode/tdm/tdm.qc @@ -1,5 +1,8 @@ -#include "gamemode_tdm.qh" +#include "tdm.qh" +// TODO: sv_tdm +// TODO? rename to teamdeathmatch +#ifdef SVQC int autocvar_g_tdm_teams; int autocvar_g_tdm_teams_override; @@ -61,3 +64,4 @@ MUTATOR_HOOKFUNCTION(tdm, Scores_CountFragsRemaining) // announce remaining frags return true; } +#endif diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qh b/qcsrc/common/gamemodes/gamemode/tdm/tdm.qh similarity index 90% rename from qcsrc/server/mutators/mutator/gamemode_tdm.qh rename to qcsrc/common/gamemodes/gamemode/tdm/tdm.qh index c163962faf..1c8674a015 100644 --- a/qcsrc/server/mutators/mutator/gamemode_tdm.qh +++ b/qcsrc/common/gamemodes/gamemode/tdm/tdm.qh @@ -1,7 +1,7 @@ #pragma once -#include "../gamemode.qh" - +#ifdef SVQC +#include int autocvar_g_tdm_point_limit; int autocvar_g_tdm_point_leadlimit; bool autocvar_g_tdm_team_spawns; @@ -21,3 +21,4 @@ REGISTER_MUTATOR(tdm, false) } return 0; } +#endif diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh index 35a643d53b..979477cbaf 100644 --- a/qcsrc/common/gamemodes/sv_rules.qh +++ b/qcsrc/common/gamemodes/sv_rules.qh @@ -1,5 +1,9 @@ #pragma once +// TODO: find a better location for these? +float total_players; +float redalive, bluealive, yellowalive, pinkalive; + // todo: accept the number of teams as a parameter void GameRules_teams(bool value); diff --git a/qcsrc/common/monsters/sv_spawner.qh b/qcsrc/common/monsters/sv_spawner.qh index 6f70f09bee..1fd3ec672f 100644 --- a/qcsrc/common/monsters/sv_spawner.qh +++ b/qcsrc/common/monsters/sv_spawner.qh @@ -1 +1,3 @@ #pragma once + +.string spawnmob; diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index b8cd3cdab6..1bd7edcd95 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -50,6 +50,7 @@ #include "../common/mutators/mutator/waypoints/all.qh" #include "../common/mutators/mutator/instagib/sv_instagib.qh" +#include #include "../common/mapobjects/subs.qh" #include "../common/mapobjects/triggers.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 291d8b178b..2267c144a3 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -17,6 +17,7 @@ #include "../teamplay.qh" #include "../mutators/_mod.qh" +#include #ifdef SVQC #include diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 6de4507b17..35b172e7fd 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -21,6 +21,7 @@ #include "../bot/api.qh" #include "../mutators/_mod.qh" +#include #include #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 638dbb1565..48cf949d4e 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -15,6 +15,7 @@ #include "../scores.qh" #include "../mutators/_mod.qh" +#include #include #include diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc index f0108dec37..582c2852f3 100644 --- a/qcsrc/server/mutators/_mod.inc +++ b/qcsrc/server/mutators/_mod.inc @@ -1,4 +1,2 @@ // generated file; do not modify #include - -#include diff --git a/qcsrc/server/mutators/_mod.qh b/qcsrc/server/mutators/_mod.qh index 9888c94666..9ba0319fe4 100644 --- a/qcsrc/server/mutators/_mod.qh +++ b/qcsrc/server/mutators/_mod.qh @@ -1,4 +1,2 @@ // generated file; do not modify #include - -#include diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh deleted file mode 100644 index 8289d51d59..0000000000 --- a/qcsrc/server/mutators/gamemode.qh +++ /dev/null @@ -1,109 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -#include "mutator.qh" - -// TODO: trim - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include - -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -.float lastground; -float total_players; -float redalive, bluealive, yellowalive, pinkalive; diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh deleted file mode 100644 index bea16f7a34..0000000000 --- a/qcsrc/server/mutators/mutator.qh +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include diff --git a/qcsrc/server/mutators/mutator/_mod.inc b/qcsrc/server/mutators/mutator/_mod.inc deleted file mode 100644 index 6835f5d560..0000000000 --- a/qcsrc/server/mutators/mutator/_mod.inc +++ /dev/null @@ -1,14 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/server/mutators/mutator/_mod.qh b/qcsrc/server/mutators/mutator/_mod.qh deleted file mode 100644 index aef0b332ab..0000000000 --- a/qcsrc/server/mutators/mutator/_mod.qh +++ /dev/null @@ -1,14 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index a137f4150e..a30e4696dd 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -12,7 +12,7 @@ #include "mutators/_mod.qh" #include "../common/deathtypes/all.qh" -#include "../common/gamemodes/_mod.qh" +#include #include "../common/teams.qh" void TeamchangeFrags(entity e) -- 2.39.2