Revert changes for Demo to d3xp/ - Demo only needs game/ code

This commit is contained in:
Daniel Gibson 2019-01-04 03:55:00 +01:00
parent 7d9d8680e1
commit cf35cecbc7

View file

@ -29,7 +29,6 @@ If you have questions concerning this license or the applicable additional terms
#include "sys/platform.h" #include "sys/platform.h"
#include "framework/DeclEntityDef.h" #include "framework/DeclEntityDef.h"
#include "framework/DeclSkin.h" #include "framework/DeclSkin.h"
#include "framework/Session.h"
#include "gamesys/SysCvar.h" #include "gamesys/SysCvar.h"
#include "ai/AI.h" #include "ai/AI.h"
@ -466,8 +465,7 @@ void idWeapon::Restore( idRestoreGame *savefile ) {
WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" ); WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" );
WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" ); WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" );
WEAPON_NETENDRELOAD.LinkTo( scriptObject, "WEAPON_NETENDRELOAD" ); 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_RAISEWEAPON.LinkTo( scriptObject, "WEAPON_RAISEWEAPON" );
WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" ); WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" );
@ -695,8 +693,7 @@ void idWeapon::Clear( void ) {
WEAPON_RELOAD.Unlink(); WEAPON_RELOAD.Unlink();
WEAPON_NETRELOAD.Unlink(); WEAPON_NETRELOAD.Unlink();
WEAPON_NETENDRELOAD.Unlink(); WEAPON_NETENDRELOAD.Unlink();
if (!session->demoversion) WEAPON_NETFIRING.Unlink();
WEAPON_NETFIRING.Unlink();
WEAPON_RAISEWEAPON.Unlink(); WEAPON_RAISEWEAPON.Unlink();
WEAPON_LOWERWEAPON.Unlink(); WEAPON_LOWERWEAPON.Unlink();
@ -1180,8 +1177,7 @@ void idWeapon::GetWeaponDef( const char *objectname, int ammoinclip ) {
WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" ); WEAPON_RELOAD.LinkTo( scriptObject, "WEAPON_RELOAD" );
WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" ); WEAPON_NETRELOAD.LinkTo( scriptObject, "WEAPON_NETRELOAD" );
WEAPON_NETENDRELOAD.LinkTo( scriptObject, "WEAPON_NETENDRELOAD" ); 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_RAISEWEAPON.LinkTo( scriptObject, "WEAPON_RAISEWEAPON" );
WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" ); WEAPON_LOWERWEAPON.LinkTo( scriptObject, "WEAPON_LOWERWEAPON" );