Shared: Inherit weapon_common from Nuclide's base game.

src/client/entities.qc

@@ -19,10 +19,10 @@ ClientGame_EntityUpdate(float id, float new)
 {
 	switch (id) {
 	default:
-		return FALSE;
+		return (0);
 	}
 
-	return TRUE;
+	return (1);
 }
 
 void

src/shared/include.src

@@ -1,7 +1,7 @@
  #includelist
 ../../../valve/src/shared/flags.h
 ../../../valve/src/shared/player.qc
-../../../valve/src/shared/weapon_common.h
+../../../base/src/shared/weapon_common.h
 ../../../valve/src/shared/animations.h
 ../../../valve/src/shared/animations.qc
 ../../../valve/src/shared/pmove.qc
@@ -37,6 +37,6 @@ w_tranquil.qc
 w_umbrella.qc
 w_wrench.qc
 weapons.qc
-../../../valve/src/shared/weapon_common.qc
-input.qc
+../../../base/src/shared/weapon_common.qc
+../../../base/src/shared/input.qc
 #endlist

src/shared/input.qc

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-void
-Game_Input(void)
-{
-#ifdef SERVER
-	if (input_buttons & INPUT_BUTTON5) {
-		Player_UseDown(); 
-	} else {
-		Player_UseUp();
-	}
-
-	if (self.impulse == 100) {
-		Flashlight_Toggle();
-	}
-
-
-	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();
-	}
-}

src/shared/w_dbs.qc

@@ -75,7 +75,7 @@ w_dbs_pickup(int new, int startammo)
 	player pl = (player)self;
 	pl.shotgun_mag = bound(0, pl.shotgun_mag + 8, 8);
 #endif
-	return TRUE;
+	return (1);
 }
 
 void

src/shared/w_sbs.qc

@@ -76,7 +76,7 @@ w_sbs_pickup(int new, int startammo)
 	player pl = (player)self;
 	pl.shotgun_mag = bound(0, pl.shotgun_mag + 8, 8);
 #endif
-	return TRUE;
+	return (1);
 }
 
 void