From cf35cecbc7e3118d35fff3fc5662b15d8f6115ff Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Fri, 4 Jan 2019 03:55:00 +0100 Subject: [PATCH] Revert changes for Demo to d3xp/ - Demo only needs game/ code --- neo/d3xp/Weapon.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neo/d3xp/Weapon.cpp b/neo/d3xp/Weapon.cpp index 679a0532..30f8882b 100644 --- a/neo/d3xp/Weapon.cpp +++ b/neo/d3xp/Weapon.cpp @@ -29,7 +29,6 @@ If you have questions concerning this license or the applicable additional terms #include "sys/platform.h" #include "framework/DeclEntityDef.h" #include "framework/DeclSkin.h" -#include "framework/Session.h" #include "gamesys/SysCvar.h" #include "ai/AI.h" @@ -466,8 +465,7 @@ void idWeapon::Restore( idRestoreGame *savefile ) { WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" ); WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" ); WEAPON_NETENDRELOAD.LinkTo( scriptObject, "WEAPON_NETENDRELOAD" ); - if (!session->demoversion) - WEAPON_NETFIRING.LinkTo( scriptObject, "WEAPON_NETFIRING" ); + WEAPON_NETFIRING.LinkTo( scriptObject, "WEAPON_NETFIRING" ); WEAPON_RAISEWEAPON.LinkTo( scriptObject, "WEAPON_RAISEWEAPON" ); WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" ); @@ -695,8 +693,7 @@ void idWeapon::Clear( void ) { WEAPON_RELOAD.Unlink(); WEAPON_NETRELOAD.Unlink(); WEAPON_NETENDRELOAD.Unlink(); - if (!session->demoversion) - WEAPON_NETFIRING.Unlink(); + WEAPON_NETFIRING.Unlink(); WEAPON_RAISEWEAPON.Unlink(); WEAPON_LOWERWEAPON.Unlink(); @@ -1180,8 +1177,7 @@ void idWeapon::GetWeaponDef( const char *objectname, int ammoinclip ) { WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" ); WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" ); WEAPON_NETENDRELOAD.LinkTo( scriptObject, "WEAPON_NETENDRELOAD" ); - if (!session->demoversion) - WEAPON_NETFIRING.LinkTo( scriptObject, "WEAPON_NETFIRING" ); + WEAPON_NETFIRING.LinkTo( scriptObject, "WEAPON_NETFIRING" ); WEAPON_RAISEWEAPON.LinkTo( scriptObject, "WEAPON_RAISEWEAPON" ); WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" );