Merge client/input.qc and server/input.qc into shared/input.qc

eukara · Mar 9, 2021 · 24428a0 · 24428a0
1 parent a6a0abc
commit 24428a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → src/shared/input.qc b/src/server/input.qc → src/shared/input.qc
@@ -17,23 +17,14 @@
 void
 Game_Input(void)
 {
+#ifdef SERVER
 	CGameRules rules = (CGameRules)g_grMode;
 
 	if (rules.m_iIntermission) {
 		rules.IntermissionEnd();
 		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();
+	}
 }