FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove @malortie's hacks.

This commit is contained in:
Night Owl 2016-12-07 00:24:14 +05:00
parent 19c323874b
commit f15b5d686b
3 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/cbase.cpp
View File

@ -135,20 +135,6 @@ int DispatchSpawn( edict_t *pent )
if( pEntity )
{
//
// The Gate:
//
// Prevent level shutting down due to engine limitation.
//
if( FStrEq( STRING( gpGlobals->mapname ), "gate18" ) )
{
if( FStringNull( pEntity->pev->targetname ) )
{
if( FClassnameIs( pEntity->pev, "monster_furniture" ) )
return 0;
}
}
// Initialize these or entities who don't link to the world won't have anything in here
pEntity->pev->absmin = pEntity->pev->origin - Vector( 1, 1, 1 );
pEntity->pev->absmax = pEntity->pev->origin + Vector( 1, 1, 1 );

14
dlls/scripted.cpp
View File

@ -1157,23 +1157,11 @@ public:
void Spawn( void );
void Die( void );
int Classify( void );
virtual int ObjectCaps( void );
virtual int ObjectCaps( void ) { return ( CBaseMonster::ObjectCaps() & ~FCAP_ACROSS_TRANSITION ); }
};
LINK_ENTITY_TO_CLASS( monster_furniture, CFurniture )
int CFurniture::ObjectCaps( void )
{
int caps = ( CBaseMonster::ObjectCaps() & ~FCAP_ACROSS_TRANSITION );
if( FStrEq( STRING( gpGlobals->mapname ), "gate18" ) )
{
caps |= FCAP_DONT_SAVE;
}
return caps;
}
//=========================================================
// Furniture is killed
//=========================================================

14
dlls/triggers.cpp
View File

@ -779,20 +779,6 @@ void CTargetCDAudio::Play( void )
void CTriggerHurt::Spawn( void )
{
//
// The Gate:
//
// Remove to prevent a crash.
//
if( FStrEq( STRING( gpGlobals->mapname ), "tombtest2" ) )
{
if( !FStringNull( pev->targetname ) && FStrEq( STRING( pev->targetname ), "secondspikes" ) )
{
UTIL_Remove( this );
return;
}
}
InitTrigger();
SetTouch( &CBaseTrigger::HurtTouch );