YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-11 15:38:12 +00:00
Code Issues Projects Releases Wiki Activity

Double promotion fixes.

Browse Source
This commit is contained in:
Andrey Akhmichin 2020-01-11 02:22:24 +05:00
parent 7ae98c37be
commit 3164c97623
19 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cl_dll/ev_hldm.cpp
View File

@ -473,9 +473,9 @@ void EV_TrainPitchAdjust( event_args_t *args )
us_params = (unsigned short)args->iparam1; us_params = (unsigned short)args->iparam1;
stop = args->bparam1; stop = args->bparam1;
m_flVolume = (float)( us_params & 0x003f ) / 40.0; m_flVolume = (float)( us_params & 0x003f ) / 40.0f;
noise = (int)( ( ( us_params ) >> 12 ) & 0x0007 ); noise = (int)( ( ( us_params ) >> 12 ) & 0x0007 );
pitch = (int)( 10.0 * (float)( ( us_params >> 6 ) & 0x003f ) ); pitch = (int)( 10.0f * (float)( ( us_params >> 6 ) & 0x003f ) );
switch( noise ) switch( noise )
{ {

16
dlls/aomdc/axe.cpp
View File

@ -107,7 +107,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2); vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2);
UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
tr = tmpTrace; tr = tmpTrace;
return; return;
@ -124,7 +124,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecEnd.z = vecHullEnd.z + minmaxs[k][2]; vecEnd.z = vecHullEnd.z + minmaxs[k][2];
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length(); float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length();
if ( thisDistance < distance ) if ( thisDistance < distance )
@ -176,10 +176,10 @@ int CAxe::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
// Calculate the point of intersection of the line (or hull) and the object we hit // Calculate the point of intersection of the line (or hull) and the object we hit
// This is and approximation of the "best" intersection // This is and approximation of the "best" intersection
@ -196,13 +196,13 @@ int CAxe::Swing( int fFirst )
0.0, 0, 0.0 ); 0.0, 0, 0.0 );
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
if (fFirst) if (fFirst)
{ {
// miss // miss
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.9; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.9f;
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
} }
@ -269,7 +269,7 @@ int CAxe::Swing( int fFirst )
m_pPlayer->m_iWeaponVolume = flVol * CROWBAR_WALLHIT_VOLUME; m_pPlayer->m_iWeaponVolume = flVol * CROWBAR_WALLHIT_VOLUME;
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.9; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.9f;
SetThink(&CAxe:: Smack ); SetThink(&CAxe:: Smack );
SetNextThink( 0.2 ); SetNextThink( 0.2 );

4
dlls/aomdc/baddavid.cpp
View File

@ -24,7 +24,7 @@
#define BADDAVID_AE_ATTACK 1 #define BADDAVID_AE_ATTACK 1
#define BADDAVID_AE_FLINCH 1013 #define BADDAVID_AE_FLINCH 1013
#define BADDAVID_FLINCH_DELAY 15.0 #define BADDAVID_FLINCH_DELAY 15.0f
#define BADDAVID_HEALTH 1800 #define BADDAVID_HEALTH 1800
#define SF_NOELECTROCUTE ( 1 << 5 ) #define SF_NOELECTROCUTE ( 1 << 5 )
@ -428,7 +428,7 @@ LINK_ENTITY_TO_CLASS( lightning_effect_boss, CLightningEffect )
void CLightningEffect::Spawn() void CLightningEffect::Spawn()
{ {
SetThink( &CLightningEffect::ElectricityAttack2 ); SetThink( &CLightningEffect::ElectricityAttack2 );
pev->nextthink = gpGlobals->time + 1.0; pev->nextthink = gpGlobals->time + 1.0f;
} }
void CLightningEffect::ElectricityAttack2() void CLightningEffect::ElectricityAttack2()

2
dlls/aomdc/beretta.cpp
View File

@ -113,7 +113,7 @@ void CBeretta::PrimaryAttack( void )
if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) ) if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) )
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }

5
dlls/aomdc/deagle.cpp
View File

@ -102,13 +102,12 @@ BOOL CDeagle::Deploy( )
void CDeagle::PrimaryAttack( void ) void CDeagle::PrimaryAttack( void )
{ {
float flSpread = 0.01; float flSpread = 0.01f;
if ( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) ) if ( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) )
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }

2
dlls/aomdc/glock.cpp
View File

@ -126,7 +126,7 @@ void CGlock::GlockFire( float flSpread, float flCycleTime, BOOL fUseBurst )
if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) ) if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) )
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }

8
dlls/aomdc/gmgeneral.cpp
View File

@ -117,7 +117,7 @@ void CGMGeneral::PrimaryAttack()
if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD)
{ {
PlayEmptySound( ); PlayEmptySound( );
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
@ -142,10 +142,10 @@ void CGMGeneral::PrimaryAttack()
PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usGMGeneral, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 ); PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usGMGeneral, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.07; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.07f;
if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() ) if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.07; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.07f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
} }
@ -164,7 +164,7 @@ void CGMGeneral::SecondaryAttack()
} }
EMIT_SOUND(ENT(pev), CHAN_ITEM, "gmgeneral/gm_fov.wav", 1, ATTN_NORM); EMIT_SOUND(ENT(pev), CHAN_ITEM, "gmgeneral/gm_fov.wav", 1, ATTN_NORM);
m_flNextPrimaryAttack = m_flNextSecondaryAttack = 0.4; m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.4f;
} }
void CGMGeneral::Reload( void ) void CGMGeneral::Reload( void )

12
dlls/aomdc/hammer.cpp
View File

@ -107,7 +107,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2); vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2);
UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
tr = tmpTrace; tr = tmpTrace;
return; return;
@ -124,7 +124,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecEnd.z = vecHullEnd.z + minmaxs[k][2]; vecEnd.z = vecHullEnd.z + minmaxs[k][2];
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length(); float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length();
if ( thisDistance < distance ) if ( thisDistance < distance )
@ -145,7 +145,7 @@ void CHammer::PrimaryAttack()
SendWeaponAnim( HAMMER_WHACK ); SendWeaponAnim( HAMMER_WHACK );
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
SetThink( &CHammer::BigWhackThink ); SetThink( &CHammer::BigWhackThink );
pev->nextthink = gpGlobals->time + 0.45; pev->nextthink = gpGlobals->time + 0.45f;
#endif #endif
} }
@ -160,10 +160,10 @@ void CHammer::BigWhackThink()
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
// Calculate the point of intersection of the line (or hull) and the object we hit // Calculate the point of intersection of the line (or hull) and the object we hit
// This is and approximation of the "best" intersection // This is and approximation of the "best" intersection
@ -178,7 +178,7 @@ void CHammer::BigWhackThink()
0.0, g_vecZero, g_vecZero, 0, 0, 0, 0.0, g_vecZero, g_vecZero, 0, 0, 0,
0.0, 0, 0.0 ); 0.0, 0, 0.0 );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );

22
dlls/aomdc/knife.cpp
View File

@ -100,7 +100,7 @@ BOOL CKnife::Deploy( )
void CKnife::Holster( int skiplocal /* = 0 */ ) void CKnife::Holster( int skiplocal /* = 0 */ )
{ {
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5f;
SendWeaponAnim( KNIFE_HOLSTER ); SendWeaponAnim( KNIFE_HOLSTER );
} }
@ -118,7 +118,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2); vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2);
UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
tr = tmpTrace; tr = tmpTrace;
return; return;
@ -135,7 +135,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecEnd.z = vecHullEnd.z + minmaxs[k][2]; vecEnd.z = vecHullEnd.z + minmaxs[k][2];
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length(); float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length();
if ( thisDistance < distance ) if ( thisDistance < distance )
@ -187,10 +187,10 @@ int CKnife::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
// Calculate the point of intersection of the line (or hull) and the object we hit // Calculate the point of intersection of the line (or hull) and the object we hit
// This is and approximation of the "best" intersection // This is and approximation of the "best" intersection
@ -207,13 +207,13 @@ int CKnife::Swing( int fFirst )
0.0, 0, 0.0 ); 0.0, 0, 0.0 );
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
if (fFirst) if (fFirst)
{ {
// miss // miss
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f;
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
} }
@ -262,7 +262,7 @@ int CKnife::Swing( int fFirst )
m_pPlayer->m_iWeaponVolume = CROWBAR_BODYHIT_VOLUME; m_pPlayer->m_iWeaponVolume = CROWBAR_BODYHIT_VOLUME;
if ( !pEntity->IsAlive() ) if ( !pEntity->IsAlive() )
{ {
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25; //LRC: corrected half-life bug m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f; //LRC: corrected half-life bug
return TRUE; return TRUE;
} }
else else
@ -304,8 +304,8 @@ int CKnife::Swing( int fFirst )
m_pPlayer->m_iWeaponVolume = flVol * CROWBAR_WALLHIT_VOLUME; m_pPlayer->m_iWeaponVolume = flVol * CROWBAR_WALLHIT_VOLUME;
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f;
SetThink(&CKnife:: Smack ); SetThink(&CKnife:: Smack );
SetNextThink( 0.2 ); SetNextThink( 0.2 );
#endif #endif

12
dlls/aomdc/mp5k.cpp
View File

@ -117,14 +117,14 @@ void CMP5K::PrimaryAttack()
if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD)
{ {
PlayEmptySound( ); PlayEmptySound( );
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
if (m_iClip <= 0) if (m_iClip <= 0)
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
@ -143,7 +143,7 @@ void CMP5K::PrimaryAttack()
Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgMP5K, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if defined( CLIENT_WEAPONS )
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
@ -152,10 +152,10 @@ void CMP5K::PrimaryAttack()
PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usMP5k, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 ); PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usMP5k, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.06; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.06f;
if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() ) if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.06; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.06f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
} }
@ -165,7 +165,7 @@ void CMP5K::Reload( void )
if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == MP5K_MAX_CLIP ) if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == MP5K_MAX_CLIP )
return; return;
DefaultReload( MP5K_MAX_CLIP, MP5K_RELOAD, 3.6 ); DefaultReload( MP5K_MAX_CLIP, MP5K_RELOAD, 3.6f );
} }

2
dlls/aomdc/p228.cpp
View File

@ -111,7 +111,7 @@ void CP228::PrimaryAttack( void )
if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) ) if( m_iClip <= 0 || (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) )
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }

20
dlls/aomdc/spear.cpp
View File

@ -113,7 +113,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2); vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2);
UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
tr = tmpTrace; tr = tmpTrace;
return; return;
@ -130,7 +130,7 @@ void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, f
vecEnd.z = vecHullEnd.z + minmaxs[k][2]; vecEnd.z = vecHullEnd.z + minmaxs[k][2];
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace );
if ( tmpTrace.flFraction < 1.0 ) if ( tmpTrace.flFraction < 1.0f )
{ {
float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length(); float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length();
if ( thisDistance < distance ) if ( thisDistance < distance )
@ -150,7 +150,7 @@ void CSpear::PrimaryAttack()
if( FBitSet( m_pPlayer->pev->flags, FL_INWATER ) ) if( FBitSet( m_pPlayer->pev->flags, FL_INWATER ) )
{ {
SendWeaponAnim( SPEAR_ELECTROCUTE ); SendWeaponAnim( SPEAR_ELECTROCUTE );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 2.34; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 2.34f;
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
UTIL_ScreenFade( m_pPlayer, Vector( 255, 255, 255 ), 0.5, 0.0, 100, FFADE_IN ); UTIL_ScreenFade( m_pPlayer, Vector( 255, 255, 255 ), 0.5, 0.0, 100, FFADE_IN );
m_pPlayer->TakeDamage(m_pPlayer->pev, m_pPlayer->pev, DAMAGE_AIM, DMG_GENERIC ); m_pPlayer->TakeDamage(m_pPlayer->pev, m_pPlayer->pev, DAMAGE_AIM, DMG_GENERIC );
@ -160,10 +160,10 @@ void CSpear::PrimaryAttack()
else else
{ {
SendWeaponAnim( SPEAR_STAB_START ); SendWeaponAnim( SPEAR_STAB_START );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.0; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.0f;
SetThink( &CSpear::BigSpearStab ); SetThink( &CSpear::BigSpearStab );
pev->nextthink = gpGlobals->time + 0.3; pev->nextthink = gpGlobals->time + 0.3f;
} }
} }
@ -182,10 +182,10 @@ void CSpear::BigSpearStab()
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
// Calculate the point of intersection of the line (or hull) and the object we hit // Calculate the point of intersection of the line (or hull) and the object we hit
// This is and approximation of the "best" intersection // This is and approximation of the "best" intersection
@ -201,7 +201,7 @@ void CSpear::BigSpearStab()
0.0, g_vecZero, g_vecZero, 0, 0, 0, 0.0, g_vecZero, g_vecZero, 0, 0, 0,
0.0, 0, 0.0 ); 0.0, 0, 0.0 );
if ( tr.flFraction < 1.0 ) if ( tr.flFraction < 1.0f )
{ {
SendWeaponAnim( SPEAR_STAB ); SendWeaponAnim( SPEAR_STAB );
@ -220,12 +220,12 @@ void CSpear::BigSpearStab()
m_pPlayer->EnableControl(FALSE); m_pPlayer->EnableControl(FALSE);
SetThink( &CSpear::UnStab ); SetThink( &CSpear::UnStab );
pev->nextthink = gpGlobals->time + 0.4; pev->nextthink = gpGlobals->time + 0.4f;
if (pEntity) if (pEntity)
{ {
ClearMultiDamage( ); ClearMultiDamage( );
pEntity->TraceAttack(m_pPlayer->pev, gSkillData.plrDmgKnife * 2.2, gpGlobals->v_forward, &tr, DMG_SPEAR ); pEntity->TraceAttack(m_pPlayer->pev, gSkillData.plrDmgKnife * 2.2f, gpGlobals->v_forward, &tr, DMG_SPEAR );
ApplyMultiDamage( m_pPlayer->pev, m_pPlayer->pev ); ApplyMultiDamage( m_pPlayer->pev, m_pPlayer->pev );
if ( pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE ) if ( pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE )

10
dlls/aomdc/uzi.cpp
View File

@ -114,14 +114,14 @@ void CUzi::PrimaryAttack()
if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD) if (m_pPlayer->pev->waterlevel == 3 && m_pPlayer->pev->watertype > CONTENT_FLYFIELD)
{ {
PlayEmptySound( ); PlayEmptySound( );
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
if (m_iClip <= 0) if (m_iClip <= 0)
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
@ -140,7 +140,7 @@ void CUzi::PrimaryAttack()
Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgUzi, m_pPlayer->pev, m_pPlayer->random_seed ); Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, gSkillData.plrDmgUzi, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if defined( CLIENT_WEAPONS )
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
@ -149,10 +149,10 @@ void CUzi::PrimaryAttack()
PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usUzi, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 ); PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usUzi, 0.0, g_vecZero, g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.08; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.08f;
if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() ) if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.08; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.08f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
} }

2
dlls/aomdc/wheelchair.cpp
View File

@ -21,7 +21,7 @@
#define WHEELCHAIR_AE_BLOODSQUIRT 1 #define WHEELCHAIR_AE_BLOODSQUIRT 1
#define WHEELCHAIR_AE_WALK 1011 #define WHEELCHAIR_AE_WALK 1011
#define WHEELCHAIR_FLINCH_DELAY 5.0 #define WHEELCHAIR_FLINCH_DELAY 5.0f
class CWheelchair : public CZombie class CWheelchair : public CZombie
{ {

4
dlls/bmodels.cpp
View File

@ -176,7 +176,7 @@ void CFuncLol::Spawn()
{ {
CFuncWall::Spawn(); CFuncWall::Spawn();
SetThink( &CFuncLol::Lol ); SetThink( &CFuncLol::Lol );
pev->nextthink = gpGlobals->time + 1.0; pev->nextthink = gpGlobals->time + 1.0f;
} }
void CFuncLol::Lol() void CFuncLol::Lol()
@ -196,7 +196,7 @@ void CFuncLol::Lol()
ClearBits( pev->effects, EF_NODRAW ); ClearBits( pev->effects, EF_NODRAW );
} }
pev->nextthink = gpGlobals->time + 1.0; pev->nextthink = gpGlobals->time + 1.0f;
return; return;
} }
} }

4
dlls/buttons.cpp
View File

@ -218,7 +218,7 @@ void CEnvState::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use
m_iState = STATE_TURN_OFF; m_iState = STATE_TURN_OFF;
if (pev->spawnflags & SF_ENVSTATE_DEBUG) if (pev->spawnflags & SF_ENVSTATE_DEBUG)
{ {
ALERT(at_console,"DEBUG: env_state \"%s\" triggered; will turn off in %f seconds.\n", STRING(pev->targetname), (float)m_fTurnOffTime); ALERT(at_console,"DEBUG: env_state \"%s\" triggered; will turn off in %f seconds.\n", STRING(pev->targetname), (double)m_fTurnOffTime);
} }
SetNextThink( m_fTurnOffTime ); SetNextThink( m_fTurnOffTime );
} }
@ -250,7 +250,7 @@ void CEnvState::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use
m_iState = STATE_TURN_ON; m_iState = STATE_TURN_ON;
if (pev->spawnflags & SF_ENVSTATE_DEBUG) if (pev->spawnflags & SF_ENVSTATE_DEBUG)
{ {
ALERT(at_console,"DEBUG: env_state \"%s\" triggered; will turn on in %f seconds.\n", STRING(pev->targetname), m_fTurnOnTime); ALERT(at_console,"DEBUG: env_state \"%s\" triggered; will turn on in %f seconds.\n", STRING(pev->targetname), (double)m_fTurnOnTime);
} }
SetNextThink( m_fTurnOnTime ); SetNextThink( m_fTurnOnTime );
} }

2
dlls/items.cpp
View File

@ -349,7 +349,7 @@ class CItemFlashlight : public CItem
EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM ); EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM );
pPlayer->pev->weapons |= ( 1 << WEAPON_FLASHLIGHT ); pPlayer->pev->weapons |= ( 1 << WEAPON_FLASHLIGHT );
pPlayer->m_flFlashLightTime = gpGlobals->time + 0.3; // + FLASH_CHARGE_TIME; pPlayer->m_flFlashLightTime = gpGlobals->time + 0.3f; // + FLASH_CHARGE_TIME;
return TRUE; return TRUE;
} }
}; };

2
dlls/scripted.cpp
View File

@ -432,7 +432,7 @@ void CCineMonster::PossessEntity( void )
pTarget->pev->effects |= EF_NOINTERP; pTarget->pev->effects |= EF_NOINTERP;
pTarget->pev->angles.y = pev->angles.y; pTarget->pev->angles.y = pev->angles.y;
pTarget->m_scriptState = SCRIPT_WAIT; pTarget->m_scriptState = SCRIPT_WAIT;
m_startTime = gpGlobals->time + 1E6; m_startTime = gpGlobals->time + (float)1E6;
// UNDONE: Add a flag to do this so people can fixup physics after teleporting monsters // UNDONE: Add a flag to do this so people can fixup physics after teleporting monsters
pTarget->pev->flags &= ~FL_ONGROUND; pTarget->pev->flags &= ~FL_ONGROUND;
break; break;

2
dlls/shotgun.cpp
View File

@ -140,7 +140,7 @@ void CShotgun::PrimaryAttack()
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
SetThink( &CShotgun::LolShell ); SetThink( &CShotgun::LolShell );
pev->nextthink = gpGlobals->time + 0.6; pev->nextthink = gpGlobals->time + 0.6f;
#endif #endif
m_iClip--; m_iClip--;