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

Merge branch 'redempt' into mobile_hacks

This commit is contained in:
Andrey Akhmichin 2019-12-01 15:34:00 +05:00
parent 086980bbcc 4d5f583f35
commit c96c77622e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/game.cpp
View File

@ -234,7 +234,7 @@ cvar_t sk_nihilanth_zap3 = {"sk_nihilanth_zap3","0"};
#ifdef MOBILE_HACKS
// Absolute Redemption
// Barney
// Roy
cvar_t sk_roy_health1 = {"sk_roy_health1","0"};
cvar_t sk_roy_health2 = {"sk_roy_health2","0"};
cvar_t sk_roy_health3 = {"sk_roy_health3","0"};

8
dlls/redempt/roy.cpp
View File

@ -74,7 +74,7 @@ void CRoy::AlertSound( void )
{
if( FOkToSpeak() )
{
PlaySentence( "RO_ATTACK", RANDOM_FLOAT( 2.8, 3.2 ), VOL_NORM, ATTN_IDLE );
PlaySentence( "RO_ATTACK", RANDOM_FLOAT( 2.8f, 3.2f ), VOL_NORM, ATTN_IDLE );
}
}
}
@ -106,7 +106,7 @@ void CRoy::RoyFirePistol( void )
pitchShift -= 5;
EMIT_SOUND_DYN( ENT( pev ), CHAN_WEAPON, "roy/ro_attack2.wav", 1, ATTN_NORM, 0, 100 + pitchShift );
CSoundEnt::InsertSound( bits_SOUND_COMBAT, pev->origin, 384, 0.3 );
CSoundEnt::InsertSound( bits_SOUND_COMBAT, pev->origin, 384, 0.3f );
// UNDONE: Reload?
m_cAmmoLoaded--;// take away a bullet!
@ -227,7 +227,7 @@ static BOOL IsFacing( entvars_t *pevTest, const Vector &reference )
UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL );
// He's facing me, he meant it
if( DotProduct( forward, vecDir ) > 0.96 ) // +/- 15 degrees or so
if( DotProduct( forward, vecDir ) > 0.96f ) // +/- 15 degrees or so
{
return TRUE;
}
@ -284,7 +284,7 @@ void CRoy::PainSound( void )
if( gpGlobals->time < m_painTime )
return;
m_painTime = gpGlobals->time + RANDOM_FLOAT( 0.5, 0.75 );
m_painTime = gpGlobals->time + RANDOM_FLOAT( 0.5f, 0.75f );
switch( RANDOM_LONG( 0, 2 ) )
{