From 77712b77a2461fd045e9435b119fdd225ba847e3 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 9 Mar 2021 12:04:06 +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 (99%)

diff --git a/src/client/progs.src b/src/client/progs.src
index a964717..7464d4a 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -20,7 +20,6 @@
 ../../../src/gs-entbase/shared.src
 ../shared/include.src
 
-../../../valve/src/client/predict.qc
 init.qc
 ../../../valve/src/client/player.qc
 ../../../valve/src/client/entities.qc
@@ -31,7 +30,6 @@ init.qc
 ../../../valve/src/client/hud.qc
 ../../../valve/src/client/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 ef7de19..43abdda 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -15,9 +15,10 @@
 
 ../../../src/gs-entbase/server.src
 ../../../src/gs-entbase/shared.src
+../../../valve/src/server/defs.h
+
 ../shared/include.src
 
-../../../valve/src/server/defs.h
 
 ../../../valve/src/server/monster_apache.qc
 ../../../valve/src/server/monster_alien_controller.qc
@@ -83,7 +84,6 @@ ammo_th.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 b539bbb..6f1b49a 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -43,4 +43,5 @@ w_taurus.qc
 w_tnt.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 99%
rename from src/server/input.qc
rename to src/shared/input.qc
index 6b56e1d..a241105 100644
--- a/src/server/input.qc
+++ b/src/shared/input.qc
@@ -23,16 +23,7 @@ Handles impulse and whatnot
 */
 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 {
@@ -83,4 +74,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();
+	}
 }