vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Fixed trigger_hurt

Browse source
This commit is contained in:
Marco Cawthorne 2019-01-03 12:23:11 +01:00
parent 5fa7002844
commit 59c637c6ea
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Globals.h
View file

@ -102,7 +102,7 @@ enum {
#define CS_WEAPON_COUNT 28
enum {
WEAPON_NONE = 0,
WEAPON_NONE,
WEAPON_KNIFE,
WEAPON_USP45,
WEAPON_GLOCK18,

5
Source/gs-entbase/server/trigger_hurt.cpp
View file

@ -18,6 +18,9 @@ class trigger_hurt : CBaseTrigger
int m_iDamage;
float m_flDelay;
void() trigger_hurt;
virtual void() Trigger;
virtual void() Touch;
};
void trigger_hurt :: Trigger ( void )
@ -57,7 +60,7 @@ void trigger_hurt :: Touch ( void )
}
}
// Damage_Apply( other, this, m_iDamage, other.origin, FALSE );
Damage_Apply( other, this, m_iDamage, other.origin, FALSE );
//Damage_Apply( other, world, m_iDamage, DAMAGE_BLEED, WEAPON_NONE );
// Shut it down if used once