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

Revert "Merge 29c4d46ad0" 

This reverts commit 075fd29030.
This commit is contained in:
Night Owl 2017-07-18 22:54:03 +05:00
parent 0af3a37151
commit 5dab1c1f1d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/items.cpp
View File

@ -166,7 +166,6 @@ void CItem::Materialize( void )
}
SetTouch( &CItem::ItemTouch );
SetThink( NULL );
}
#define SF_SUIT_SHORTLOGON 0x0001

12
dlls/weapons.cpp
View File

@ -485,7 +485,7 @@ void CBasePlayerItem::Materialize( void )
pev->solid = SOLID_TRIGGER;
UTIL_SetOrigin( pev, pev->origin );// link into world.
SetTouch( &CBasePlayerItem::DefaultTouch );
SetTouch( &CBasePlayerItem::DefaultTouch);
SetThink( NULL );
}
@ -578,6 +578,13 @@ void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther )
}
SUB_UseTargets( pOther, USE_TOGGLE, 0 ); // UNDONE: when should this happen?
// If the item is falling and its Think remains FallItem after the player picks it up,
// then after the item touches the ground its Touch will be set back to DefaultTouch,
// so the player will pick it up again, this time Kill-ing the item (since we already have it in the inventory),
// which will make the pointer bad and crash the game.
if( m_pfnThink == &CBasePlayerItem::FallThink )
SetThink( NULL );
}
BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted )
@ -727,7 +734,7 @@ void CBasePlayerItem::AttachToPlayer( CBasePlayer *pPlayer )
pev->modelindex = 0;// server won't send down to clients if modelindex == 0
pev->model = iStringNull;
pev->owner = pPlayer->edict();
pev->nextthink = 0;// Remove think - prevents futher attempts to materialize
pev->nextthink = gpGlobals->time + .1;
SetTouch( NULL );
SetThink( NULL );
}
@ -1047,7 +1054,6 @@ void CBasePlayerAmmo::Materialize( void )
}
SetTouch( &CBasePlayerAmmo::DefaultTouch );
SetThink( NULL );
}
void CBasePlayerAmmo::DefaultTouch( CBaseEntity *pOther )