From 5d44660dfaa1efe497d6085a9c6553d7698c393d Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 1 Aug 2021 11:21:58 +0200 Subject: [PATCH] Gamerules: ifdef the VALVE specific bits. --- src/server/gamerules_multiplayer.qc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index 5804cb0..c440de1 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -67,7 +67,12 @@ HLMultiplayerRules::PlayerDeath(base_player pl) IntermissionStart(); } +#ifdef VALVE + /* explode all satchels */ + s_satchel_detonate((entity)pl); + /* drop their posessions into a weaponbox item */ weaponbox_spawn((player)pl); +#endif /* either gib, or make a corpse */ if (pl.health < -50) { @@ -98,9 +103,6 @@ HLMultiplayerRules::PlayerDeath(base_player pl) Sound_Play(pl, CHAN_AUTO, "player.die"); - /* explode all satchels */ - s_satchel_detonate((entity)pl); - /* force respawn */ pl.think = PutClientInServer; pl.nextthink = time + 4.0f; @@ -147,10 +149,13 @@ HLMultiplayerRules::PlayerSpawn(base_player pp) LevelNewParms(); LevelDecodeParms(pl); + +#if defined (VALVE) || defined (GEARBOX) pl.g_items = ITEM_CROWBAR | ITEM_GLOCK | ITEM_SUIT; pl.activeweapon = WEAPON_GLOCK; pl.glock_mag = 18; pl.ammo_9mm = 44; +#endif spot = Spawn_SelectRandom("info_player_deathmatch"); setorigin(pl, spot.origin);