From 59c637c6eae4cf1e630ab759abff66977ddef428 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 3 Jan 2019 12:23:11 +0100
Subject: [PATCH] Fixed trigger_hurt

---
 Source/Client/HUDOrbituaries.c            | 12 ++++++------
 Source/Globals.h                          |  4 ++--
 Source/Shared/WeaponAUG.c                 |  2 +-
 Source/gs-entbase/server/trigger_hurt.cpp |  5 ++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Source/Client/HUDOrbituaries.c b/Source/Client/HUDOrbituaries.c
index 0f69aa2f..ee2bf650 100755
--- a/Source/Client/HUDOrbituaries.c
+++ b/Source/Client/HUDOrbituaries.c
@@ -98,25 +98,25 @@ void HUD_DrawOrbituaries( void ) {
 		iOrbituaryScroll--;
 		fOrbituaryTime = time + ORBITUARY_TIME;
 	}
-	
+
 	for ( int i = 0; i < ORBITUARY_LINES; i++ ) {
 		if ( orbBuffer[ i ].sAttacker == "" ) {
 			return;
 		}
-		
+
 		// Calculate the position based on the saved offsets
 		vOrbPos_x = vVideoMins_x + vVideoResolution_x - ( orbBuffer[ i ].fOffset1 + orbBuffer[ i ].fOffset2 + orbBuffer[ i ].fOffset3 ) - 16;
-		
+
 		// Draw the attacker's name, shadow first
 		drawstring( vOrbPos, orbBuffer[ i ].sAttacker, '12 12', orbBuffer[ i ].vColor1, VGUI_WINDOW_FGALPHA, 0 );
-		
+
 		// Draw the weapon icon
 		if ( orbBuffer[ i ].fHeadShot == TRUE ) {
 			drawsubpic( vOrbPos + [ orbBuffer[ i ].fOffset1 - 4, -4 ], '36 16', "sprites/640hud1.spr_0.tga", '0 0.9375', '0.140625 0.0625', '1 0.5 0', 1, DRAWFLAG_ADDITIVE );
 		} else {
 			drawsubpic( vOrbPos + [ orbBuffer[ i ].fOffset1, -4 ], wpIconTable[ orbBuffer[ i ].fWeapon ].vSize * 256, wpIconTable[ orbBuffer[ i ].fWeapon ].sSprite, wpIconTable[ orbBuffer[ i ].fWeapon ].vOrigin, wpIconTable[ orbBuffer[ i ].fWeapon ].vSize, '1 0.5 0', 1, DRAWFLAG_ADDITIVE );
 		}
-		
+
 		// Draw the victim's name
 		drawstring( vOrbPos + [ orbBuffer[ i ].fOffset2 + orbBuffer[ i ].fOffset1, 0 ], orbBuffer[ i ].sVictim, '12 12', orbBuffer[ i ].vColor2, VGUI_WINDOW_FGALPHA, 0 );
 		vOrbPos_y += 18;
@@ -169,6 +169,6 @@ void HUD_AddOrbituaries( float fAttacker, float fAttackerTeam, float fVictim, fl
 		orbBuffer[ ORBITUARY_LINES - 1 ].fOffset2 = ( wpIconTable[ fWeapon ].vSize[0] * 256 ) + 8;
 		orbBuffer[ ORBITUARY_LINES - 1 ].fOffset3 =  stringwidth( orbBuffer[ ORBITUARY_LINES - 1 ].sVictim, TRUE, '12 12' ) + 8;
 	}
-		
+
 	fOrbituaryTime = time + ORBITUARY_TIME;
 }
diff --git a/Source/Globals.h b/Source/Globals.h
index 183e9e60..fcf7bbea 100755
--- a/Source/Globals.h
+++ b/Source/Globals.h
@@ -102,7 +102,7 @@ enum {
 
 #define CS_WEAPON_COUNT 28
 enum {
-	WEAPON_NONE = 0,
+	WEAPON_NONE,
 	WEAPON_KNIFE,
 	WEAPON_USP45,
 	WEAPON_GLOCK18,
@@ -132,7 +132,7 @@ enum {
 	WEAPON_SMOKEGRENADE
 };
 
-#define CS_EQUIPMENT_COUNT 		7
+#define CS_EQUIPMENT_COUNT 	7
 #define EQUIPMENT_KEVLAR 		1
 #define EQUIPMENT_HELMET 		2
 #define EQUIPMENT_DEFUSALKIT 	4
diff --git a/Source/Shared/WeaponAUG.c b/Source/Shared/WeaponAUG.c
index 7785d916..289f4ae0 100755
--- a/Source/Shared/WeaponAUG.c
+++ b/Source/Shared/WeaponAUG.c
@@ -27,7 +27,7 @@
 .int iMag_AUG;
 
 // Weapon Info
-weaponinfo_t wptAUG = { 
+weaponinfo_t wptAUG = {
 	WEAPON_AUG, 		// Identifier
 	SLOT_PRIMARY,		// Slot
 	3500, 				// Price
diff --git a/Source/gs-entbase/server/trigger_hurt.cpp b/Source/gs-entbase/server/trigger_hurt.cpp
index efc94dd6..77fb4288 100644
--- a/Source/gs-entbase/server/trigger_hurt.cpp
+++ b/Source/gs-entbase/server/trigger_hurt.cpp
@@ -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