From ab45306e2da9c89694ea77fbdbea01779e215efe Mon Sep 17 00:00:00 2001 From: Night Owl Date: Sun, 24 Dec 2017 19:23:20 +0500 Subject: [PATCH] Fix build. --- cl_dll/ev_hldm.cpp | 2 +- dlls/doors.cpp | 5 ++--- dlls/player.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp index 72964b90..03d77fd7 100644 --- a/cl_dll/ev_hldm.cpp +++ b/cl_dll/ev_hldm.cpp @@ -644,7 +644,7 @@ void EV_FireShotGunSingle( event_args_t *args ) EV_GetGunPosition( args, vecSrc, origin ); VectorCopy( forward, vecAiming ); - EV_HLDM_FireBullets( idx, forward, right, up, 6, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx - 1], 0.08716, 0.08716 ); + EV_HLDM_FireBullets( idx, forward, right, up, 6, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &g_tracerCount[idx - 1], 0.08716, 0.08716 ); } //====================== // SHOTGUN END diff --git a/dlls/doors.cpp b/dlls/doors.cpp index 04cd0c1c..8f561558 100644 --- a/dlls/doors.cpp +++ b/dlls/doors.cpp @@ -23,7 +23,6 @@ #include "cbase.h" #include "doors.h" #include "game.h" -#include "weapons.h" extern void SetMovedir( entvars_t *ev ); @@ -751,12 +750,12 @@ void CBaseDoor::Blocked( CBaseEntity *pOther ) if( pev->dmg ) pOther->TakeDamage( pev, pev, pev->dmg, DMG_CRUSH ); - if( satchelfix.value ) + /*if( satchelfix.value ) { // Detonate satchels if( !strcmp( "monster_satchel", STRING( pOther->pev->classname ) ) ) ( (CSatchel*)pOther )->Use( this, this, USE_ON, 0 ); - } + }*/ // if a door has a negative wait, it would never come back if blocked, // so let it just squash the object to death real fast diff --git a/dlls/player.cpp b/dlls/player.cpp index eb83901e..656f5fd3 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -835,8 +835,8 @@ void CBasePlayer::RemoveAllItems( BOOL removeSuit ) for( i = 0; i < MAX_AMMO_SLOTS; i++ ) m_rgAmmo[i] = 0; - if( satchelfix.value ) - DeactivateSatchels( this ); + /*if( satchelfix.value ) + DeactivateSatchels( this );*/ UpdateClientData();