From 24428a072fdd5d944b48a6e1e1931a5f81377a54 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 9 Mar 2021 11:54:15 +0100
Subject: [PATCH] Merge client/input.qc and server/input.qc into
 shared/input.qc

---
 src/client/progs.src            |  1 -
 src/server/defs.h               |  2 ++
 src/server/progs.src            |  1 -
 src/shared/include.src          |  1 +
 src/{server => shared}/input.qc | 22 ++++++++++++----------
 5 files changed, 15 insertions(+), 12 deletions(-)
 rename src/{server => shared}/input.qc (99%)

diff --git a/src/client/progs.src b/src/client/progs.src
index 1b33b5d..a7735e4 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -33,7 +33,6 @@ crosshair.qc
 hud.qc
 hud_weaponselect.qc
 ../../../valve/src/client/scoreboard.qc
-../../../valve/src/client/input.qc
 radio.qc
 ../../../base/src/client/modelevent.qc
 
diff --git a/src/server/defs.h b/src/server/defs.h
index 442a4dc..f007643 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -18,6 +18,8 @@
 #include "money.h"
 #include "radio.h"
 #include "../../../valve/src/server/items.h"
+#include "../../../valve/src/server/flashlight.h"
+#include "../../../valve/src/server/player.h"
 
 var int g_cstrike_buying = 0;
 var float g_cstrike_bombradius = 500;
diff --git a/src/server/progs.src b/src/server/progs.src
index 518b412..c299ef3 100755
--- a/src/server/progs.src
+++ b/src/server/progs.src
@@ -53,7 +53,6 @@ server.qc
 ../../../valve/src/server/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 cb65439..5a0b445 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -47,6 +47,7 @@ w_hegrenade.qc
 w_smokegrenade.qc
 weapons.qc
 ../../../valve/src/shared/weapon_common.qc
+input.qc
 pmove.qc
 ../../../valve/src/shared/pmove_water.qc
 item_c4bomb.qc
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 39f9987..c967e6b 100644
--- a/src/server/input.qc
+++ b/src/shared/input.qc
@@ -17,6 +17,7 @@
 void
 Game_Input(void)
 {
+#ifdef SERVER
 	CGameRules rules = (CGameRules)g_grMode;
 
 	if (rules.m_iIntermission) {
@@ -24,16 +25,6 @@ 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 {
@@ -90,4 +81,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();
+	}
 }