mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-03-13 05:51:19 +00:00
Remove @malortie's hacks.
This commit is contained in:
parent
19c323874b
commit
f15b5d686b
@ -135,20 +135,6 @@ int DispatchSpawn( edict_t *pent )
|
|||||||
|
|
||||||
if( pEntity )
|
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
|
// 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->absmin = pEntity->pev->origin - Vector( 1, 1, 1 );
|
||||||
pEntity->pev->absmax = pEntity->pev->origin + Vector( 1, 1, 1 );
|
pEntity->pev->absmax = pEntity->pev->origin + Vector( 1, 1, 1 );
|
||||||
|
@ -1157,23 +1157,11 @@ public:
|
|||||||
void Spawn( void );
|
void Spawn( void );
|
||||||
void Die( void );
|
void Die( void );
|
||||||
int Classify( 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 )
|
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
|
// Furniture is killed
|
||||||
//=========================================================
|
//=========================================================
|
||||||
|
@ -779,20 +779,6 @@ void CTargetCDAudio::Play( void )
|
|||||||
|
|
||||||
void CTriggerHurt::Spawn( 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();
|
InitTrigger();
|
||||||
SetTouch( &CBaseTrigger::HurtTouch );
|
SetTouch( &CBaseTrigger::HurtTouch );
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user