Shared: Inherit weapon_common and input from Nuclide's base game.

src/server/monster_scientist.qc

@@ -101,7 +101,7 @@ monster_scientist::AttackMelee(void)
 	/* functional */
 	think = AttackNeedle;
 	nextthink = 0.25f;
-	return TRUE;
+	return (1);
 }
 
 void

src/shared/include.src

@@ -2,7 +2,7 @@
 ../../../valve/src/shared/entities.h
 ../../../valve/src/shared/flags.h
 player.qc
-../../../valve/src/shared/weapon_common.h
+../../../base/src/shared/weapon_common.h
 ../../../valve/src/shared/animations.h
 ../../../valve/src/shared/animations.qc
 pmove.qc
@@ -35,6 +35,6 @@ w_cannon.qc
 w_chainsaw.qc
 w_hammer.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,50 +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.
- */
-
-/*
-=================
-Input_Handle
-
-Handles impulse and whatnot
-=================
-*/
-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/player.qc

@@ -394,11 +394,11 @@ float
 player::SendEntity(entity ePEnt, float fChanged)
 {
 	if (health <= 0 && ePEnt != this) {
-		return FALSE;
+		return (0);
 	}
 
 	if (clienttype(ePEnt) != CLIENTTYPE_REAL) {
-		return FALSE;
+		return (0);
 	}
 
 	if (ePEnt != self) {
@@ -463,6 +463,6 @@ player::SendEntity(entity ePEnt, float fChanged)
 		WriteByte(MSG_ENTITY, ammo_hammer_state);
 	}
 
-	return TRUE;
+	return (1);
 }
 #endif

src/shared/w_cannon.qc

@@ -96,11 +96,11 @@ w_cannon_pickup(int new, int startammo)
 		if (pl.ammo_buckshot < 125) {
 			pl.ammo_buckshot = bound(0, pl.ammo_buckshot + 2, 125);
 		} else {
-			return FALSE;
+			return (0);
 		}
 	}
 #endif
-	return TRUE;
+	return (1);
 }
 
 void