From 2db41d3072326a6d77dd439e66faf19e36ced6be Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 9 Mar 2021 12:09:32 +0100
Subject: [PATCH] Merge client/input.qc and server/input.qc into
 shared/input.qc

---
 src/client/progs.src            |  2 --
 src/server/progs.src            |  4 ++--
 src/shared/include.src          |  1 +
 src/{server => shared}/input.qc | 22 ++++++++++++----------
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename src/{server => shared}/input.qc (98%)

diff --git a/src/client/progs.src b/src/client/progs.src
index b0b166a..6d6ea32 100755
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -20,7 +20,6 @@
 ../shared/include.src
 
 decore.qc
-../../../valve/src/client/predict.qc
 init.qc
 ../../../valve/src/client/player.qc
 entities.qc
@@ -31,7 +30,6 @@ entities.qc
 hud.qc
 hud_weaponselect.qc
 ../../../valve/src/client/scoreboard.qc
-../../../valve/src/client/input.qc
 ../../../base/src/client/modelevent.qc
 
 ../../../src/client/include.src
diff --git a/src/server/progs.src b/src/server/progs.src
index ac60fcf..5f7297b 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -15,10 +15,11 @@
 
 ../../../src/gs-entbase/server.src
 ../../../src/gs-entbase/shared.src
-../shared/include.src
 
 ../../../valve/src/server/defs.h
 
+../shared/include.src
+
 gunman_cycler.qc
 hologram_damage.qc
 monster_human_bandit.qc
@@ -46,7 +47,6 @@ gamerules_multiplayer.qc
 ../../../valve/src/server/flashlight.qc
 ../../../base/src/server/modelevent.qc
 
-input.qc
 ../../../valve/src/server/spawn.qc
 
 ../../../src/server/include.src
diff --git a/src/shared/include.src b/src/shared/include.src
index c44c6f9..16bdb7a 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -27,4 +27,5 @@ w_minigun.qc
 w_aicore.qc
 weapons.qc
 ../../../valve/src/shared/weapon_common.qc
+input.qc
 #endlist
diff --git a/src/server/input.qc b/src/shared/input.qc
similarity index 98%
rename from src/server/input.qc
rename to src/shared/input.qc
index 1cf7a14..0406959 100644
--- a/src/server/input.qc
+++ b/src/shared/input.qc
@@ -17,16 +17,7 @@
 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();
-	}
-
+#ifdef SERVER
 	if (input_buttons & INPUT_BUTTON5) {
 		Player_UseDown(); 
 	} else {
@@ -64,4 +55,15 @@ 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();
+	}
 }