From f14648a7f4d7944391e997091dc006b3dd472e87 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 11 Jan 2023 17:44:47 -0800 Subject: [PATCH] Removal of Game_Input which has been made obsolete. --- src/server/gamerules.h | 24 +++++++++++++----------- src/server/gamerules.qc | 23 +++++++++++++++++++++++ src/shared/include.src | 1 - 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/server/gamerules.h b/src/server/gamerules.h index 735a72a..e2b9cd2 100644 --- a/src/server/gamerules.h +++ b/src/server/gamerules.h @@ -16,19 +16,21 @@ class CSGameRules:CGameRules { - virtual void(NSClientPlayer) PlayerConnect; - virtual void(NSClientPlayer) PlayerDisconnect; - virtual void(NSClientPlayer) PlayerKill; - virtual void(NSClientPlayer) PlayerPostFrame; - virtual void(NSClientPlayer) PlayerDeath; - virtual void(NSClientPlayer) PlayerPain; + virtual void PlayerConnect(NSClientPlayer); + virtual void PlayerDisconnect(NSClientPlayer); + virtual void PlayerKill(NSClientPlayer); + virtual void PlayerPostFrame(NSClientPlayer); + virtual void PlayerDeath(NSClientPlayer); + virtual void PlayerPain(NSClientPlayer); - /* level transitions */ - virtual void(NSClientPlayer) LevelChangeParms; - virtual void(NSClientPlayer) LevelDecodeParms; - virtual void(void) LevelNewParms; +/* level transitions */ + virtual void LevelChangeParms(NSClientPlayer); + virtual void LevelDecodeParms(NSClientPlayer); + virtual void LevelNewParms(void); - virtual bool(NSClientPlayer) BuyingPossible; + virtual bool BuyingPossible(NSClientPlayer); + + virtual bool ImpulseCommand(NSClient, float); }; class CSSingleplayerRules:CSGameRules diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index e010948..9adfae2 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -192,3 +192,26 @@ CSGameRules::PlayerKill(NSClientPlayer pl) { Damage_Apply(pl, pl, pl.health, WEAPON_NONE, DMG_SKIP_ARMOR); } + +void +TriggerFlashlight(NSClient target) +{ + entity oldself = self; + self = target; + Flashlight_Toggle(); + self = oldself; +} + +bool +CSGameRules::ImpulseCommand(NSClient bp, float num) +{ + switch (num) { + case 100: + TriggerFlashlight(bp); + break; + default: + return super::ImpulseCommand(bp, num); + } + + return true; +} \ No newline at end of file diff --git a/src/shared/include.src b/src/shared/include.src index d4d7443..687ee9d 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -47,7 +47,6 @@ w_hegrenade.qc w_smokegrenade.qc weapons.qc ../../../base/src/shared/weapon_common.qc -../../../base/src/shared/input.qc pmove.qc item_c4bomb.qc #endlist