From 9c4f63ccf2b494324b14c88cda1ebb8ce8f66c0b Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 9 Mar 2021 11:51:13 +0100
Subject: [PATCH] Merge client/input.qc and server/input.qc into
 shared/input.qc for reasons regarding prediction.

---
 src/client/progs.src                          |  2 --
 src/server/defs.h                             |  2 ++
 .../predict.qc => server/flashlight.h}        | 10 +--------
 src/{client/input.qc => server/player.h}      | 15 ++-----------
 src/server/progs.src                          |  4 ++--
 src/shared/include.src                        |  1 +
 src/{server => shared}/input.qc               | 22 ++++++++++---------
 src/shared/weapon_common.h                    |  5 +++++
 8 files changed, 25 insertions(+), 36 deletions(-)
 rename src/{client/predict.qc => server/flashlight.h} (90%)
 rename src/{client/input.qc => server/player.h} (76%)
 rename src/{server => shared}/input.qc (99%)

diff --git a/src/client/progs.src b/src/client/progs.src
index bd015f9..730182d 100755
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -19,7 +19,6 @@ defs.h
 ../../../src/gs-entbase/shared.src
 ../shared/include.src
 
-predict.qc
 init.qc
 player.qc
 entities.qc
@@ -30,7 +29,6 @@ obituary.qc
 hud.qc
 hud_weaponselect.qc
 scoreboard.qc
-input.qc
 ../../../base/src/client/modelevent.qc
 
 ../../../src/client/include.src
diff --git a/src/server/defs.h b/src/server/defs.h
index 88c3448..53eaf32 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -16,3 +16,5 @@
 
 #include "gamerules.h"
 #include "items.h"
+#include "flashlight.h"
+#include "player.h"
diff --git a/src/client/predict.qc b/src/server/flashlight.h
similarity index 90%
rename from src/client/predict.qc
rename to src/server/flashlight.h
index 5aea138..d9ad0ef 100644
--- a/src/client/predict.qc
+++ b/src/server/flashlight.h
@@ -14,12 +14,4 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-void
-GamePredict_PreFrame(player pl)
-{
-}
-
-void
-GamePredict_PostFrame(player pl)
-{
-}
+void Flashlight_Toggle(void);
diff --git a/src/client/input.qc b/src/server/player.h
similarity index 76%
rename from src/client/input.qc
rename to src/server/player.h
index 63e1d2d..981c3e6 100644
--- a/src/client/input.qc
+++ b/src/server/player.h
@@ -14,16 +14,5 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-void
-Game_Input(void)
-{
-	if (input_buttons & INPUT_BUTTON0) {
-		Weapons_Primary();
-	} else if (input_buttons & INPUT_BUTTON4) {
-		Weapons_Reload();
-	} else if (input_buttons & INPUT_BUTTON3) {
-		Weapons_Secondary();
-	} else {
-		Weapons_Release();
-	}
-}
+void Player_UseDown(void);
+void Player_UseUp(void);
diff --git a/src/server/progs.src b/src/server/progs.src
index a3d7cb8..b6e3dff 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -14,10 +14,11 @@
 
 ../../../src/gs-entbase/server.src
 ../../../src/gs-entbase/shared.src
-../shared/include.src
 
 defs.h
 
+../shared/include.src
+
 monster_apache.qc
 monster_alien_controller.qc
 monster_alien_grunt.qc
@@ -81,7 +82,6 @@ rules.qc
 flashlight.qc
 ../../../base/src/server/modelevent.qc
 
-input.qc
 spawn.qc
 
 ../../../src/server/include.src
diff --git a/src/shared/include.src b/src/shared/include.src
index b454be1..979d0a6 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -33,4 +33,5 @@ w_snark.qc
 w_tripmine.qc
 weapons.qc
 weapon_common.qc
+input.qc
 #endlist
diff --git a/src/server/input.qc b/src/shared/input.qc
similarity index 99%
rename from src/server/input.qc
rename to src/shared/input.qc
index 9f802f7..6eefb1e 100644
--- a/src/server/input.qc
+++ b/src/shared/input.qc
@@ -23,6 +23,7 @@ Handles impulse and whatnot
 */
 void Game_Input(void)
 {
+#ifdef SERVER
 	CGameRules rules = (CGameRules)g_grMode;
 
 	if (rules.m_iIntermission) {
@@ -30,16 +31,6 @@ void Game_Input(void)
 		return;
 	}
 
-	if (input_buttons & INPUT_BUTTON0) {
-		Weapons_Primary();
-	} else if (input_buttons & INPUT_BUTTON4) {
-		Weapons_Reload();
-	} else if (input_buttons & INPUT_BUTTON3) {
-		Weapons_Secondary();
-	} else {
-		Weapons_Release();
-	}
-
 	if (input_buttons & INPUT_BUTTON5) {
 		Player_UseDown(); 
 	} else {
@@ -105,4 +96,15 @@ void Game_Input(void)
 	}
 
 	self.impulse = 0;
+#endif
+
+	if (input_buttons & INPUT_BUTTON0) {
+		Weapons_Primary();
+	} else if (input_buttons & INPUT_BUTTON4) {
+		Weapons_Reload();
+	} else if (input_buttons & INPUT_BUTTON3) {
+		Weapons_Secondary();
+	} else {
+		Weapons_Release();
+	}
 }
diff --git a/src/shared/weapon_common.h b/src/shared/weapon_common.h
index 9aafd65..ca592f1 100644
--- a/src/shared/weapon_common.h
+++ b/src/shared/weapon_common.h
@@ -40,6 +40,11 @@ typedef struct
 	void(int, vector, float) hudpic;
 } weapon_t;
 
+void Weapons_Primary(void);
+void Weapons_Secondary(void);
+void Weapons_Reload(void);
+void Weapons_Release(void);
+
 float Weapons_GetAim(int);
 void Weapons_Reload(void);
 void Weapons_DrawCrosshair(void);