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

12
Source/Client/HUDOrbituaries.c
View file

@ -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;
}

4
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,
@ -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

2
Source/Shared/WeaponAUG.c
View file

@ -27,7 +27,7 @@
.int iMag_AUG;
// Weapon Info
weaponinfo_t wptAUG = {
weaponinfo_t wptAUG = {
WEAPON_AUG, // Identifier
SLOT_PRIMARY, // Slot
3500, // Price

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