From d50c2ddc54cbfb040c9a99a264810f78e5f1ca03 Mon Sep 17 00:00:00 2001
From: Lyberta <lyberta@lyberta.net>
Date: Thu, 31 Aug 2017 12:52:12 +0300
Subject: [PATCH] GunGame: Moved from server to common.

---
 qcsrc/common/gamemodes/gamemode/_mod.inc                      | 1 +
 qcsrc/common/gamemodes/gamemode/_mod.qh                       | 1 +
 qcsrc/common/gamemodes/gamemode/gungame/_mod.inc              | 4 ++++
 qcsrc/common/gamemodes/gamemode/gungame/_mod.qh               | 4 ++++
 .../gamemodes/gamemode/gungame/sv_gungame.qc}                 | 2 +-
 .../gamemodes/gamemode/gungame/sv_gungame.qh}                 | 2 +-
 qcsrc/server/mutators/mutator/_mod.inc                        | 1 -
 qcsrc/server/mutators/mutator/_mod.qh                         | 1 -
 8 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 qcsrc/common/gamemodes/gamemode/gungame/_mod.inc
 create mode 100644 qcsrc/common/gamemodes/gamemode/gungame/_mod.qh
 rename qcsrc/{server/mutators/mutator/gamemode_gungame.qc => common/gamemodes/gamemode/gungame/sv_gungame.qc} (99%)
 rename qcsrc/{server/mutators/mutator/gamemode_gungame.qh => common/gamemodes/gamemode/gungame/sv_gungame.qh} (92%)

diff --git a/qcsrc/common/gamemodes/gamemode/_mod.inc b/qcsrc/common/gamemodes/gamemode/_mod.inc
index 2fc2c4046..6cec1df92 100644
--- a/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
 
+#include <common/gamemodes/gamemode/gungame/_mod.inc>
 #include <common/gamemodes/gamemode/nexball/_mod.inc>
 #include <common/gamemodes/gamemode/onslaught/_mod.inc>
diff --git a/qcsrc/common/gamemodes/gamemode/_mod.qh b/qcsrc/common/gamemodes/gamemode/_mod.qh
index d79957012..f06b224d8 100644
--- a/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
 
+#include <common/gamemodes/gamemode/gungame/_mod.qh>
 #include <common/gamemodes/gamemode/nexball/_mod.qh>
 #include <common/gamemodes/gamemode/onslaught/_mod.qh>
diff --git a/qcsrc/common/gamemodes/gamemode/gungame/_mod.inc b/qcsrc/common/gamemodes/gamemode/gungame/_mod.inc
new file mode 100644
index 000000000..a0bb67343
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/gungame/_mod.inc
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#ifdef SVQC
+    #include <common/gamemodes/gamemode/gungame/sv_gungame.qc>
+#endif
diff --git a/qcsrc/common/gamemodes/gamemode/gungame/_mod.qh b/qcsrc/common/gamemodes/gamemode/gungame/_mod.qh
new file mode 100644
index 000000000..d97ca6fed
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/gungame/_mod.qh
@@ -0,0 +1,4 @@
+// generated file; do not modify
+#ifdef SVQC
+    #include <common/gamemodes/gamemode/gungame/sv_gungame.qh>
+#endif
diff --git a/qcsrc/server/mutators/mutator/gamemode_gungame.qc b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
similarity index 99%
rename from qcsrc/server/mutators/mutator/gamemode_gungame.qc
rename to qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
index 27c62313f..7a926e07d 100644
--- a/qcsrc/server/mutators/mutator/gamemode_gungame.qc
+++ b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qc
@@ -3,7 +3,7 @@
 /// \author Lyberta
 /// \copyright GNU GPLv3 or any later version.
 
-#include "gamemode_gungame.qh"
+#include "sv_gungame.qh"
 
 //============================ Constants ======================================
 
diff --git a/qcsrc/server/mutators/mutator/gamemode_gungame.qh b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
similarity index 92%
rename from qcsrc/server/mutators/mutator/gamemode_gungame.qh
rename to qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
index e36b592a0..a427048b2 100644
--- a/qcsrc/server/mutators/mutator/gamemode_gungame.qh
+++ b/qcsrc/common/gamemodes/gamemode/gungame/sv_gungame.qh
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "../gamemode.qh"
+//#include "../gamemode.qh"
 
 /// \brief Initializes global data for the gametype.
 /// \return No return.
diff --git a/qcsrc/server/mutators/mutator/_mod.inc b/qcsrc/server/mutators/mutator/_mod.inc
index 4645a343d..6835f5d56 100644
--- a/qcsrc/server/mutators/mutator/_mod.inc
+++ b/qcsrc/server/mutators/mutator/_mod.inc
@@ -6,7 +6,6 @@
 #include <server/mutators/mutator/gamemode_deathmatch.qc>
 #include <server/mutators/mutator/gamemode_domination.qc>
 #include <server/mutators/mutator/gamemode_freezetag.qc>
-#include <server/mutators/mutator/gamemode_gungame.qc>
 #include <server/mutators/mutator/gamemode_invasion.qc>
 #include <server/mutators/mutator/gamemode_keepaway.qc>
 #include <server/mutators/mutator/gamemode_keyhunt.qc>
diff --git a/qcsrc/server/mutators/mutator/_mod.qh b/qcsrc/server/mutators/mutator/_mod.qh
index 5cc6e55b6..aef0b332a 100644
--- a/qcsrc/server/mutators/mutator/_mod.qh
+++ b/qcsrc/server/mutators/mutator/_mod.qh
@@ -6,7 +6,6 @@
 #include <server/mutators/mutator/gamemode_deathmatch.qh>
 #include <server/mutators/mutator/gamemode_domination.qh>
 #include <server/mutators/mutator/gamemode_freezetag.qh>
-#include <server/mutators/mutator/gamemode_gungame.qh>
 #include <server/mutators/mutator/gamemode_invasion.qh>
 #include <server/mutators/mutator/gamemode_keepaway.qh>
 #include <server/mutators/mutator/gamemode_keyhunt.qh>
-- 
2.39.2