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

Double promotion fixes.

This commit is contained in:
Andrey Akhmichin 2020-01-02 19:03:57 +05:00
parent e8565f7bfd
commit 0f873c953d
21 changed files with 110 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/asheep/archer.cpp
View File

@ -182,13 +182,13 @@ void CArcher::HandleAnimEvent( MonsterEvent_t *pEvent )
{ {
CBaseEntity *pHurt = m_hEnemy; CBaseEntity *pHurt = m_hEnemy;
if( m_flEnemyTouched < gpGlobals->time - 0.2 && ( m_hEnemy->BodyTarget( pev->origin ) - pev->origin).Length() > ( 32 + 16 + 32 ) ) if( ( m_flEnemyTouched < gpGlobals->time - 0.2f ) && ( m_hEnemy->BodyTarget( pev->origin ) - pev->origin).Length() > ( 32 + 16 + 32 ) )
break; break;
Vector vecShootDir = ShootAtEnemy( pev->origin ); Vector vecShootDir = ShootAtEnemy( pev->origin );
UTIL_MakeAimVectors( pev->angles ); UTIL_MakeAimVectors( pev->angles );
if( DotProduct( vecShootDir, gpGlobals->v_forward ) > 0.707 ) if( DotProduct( vecShootDir, gpGlobals->v_forward ) > 0.707f )
{ {
m_bOnAttack = TRUE; m_bOnAttack = TRUE;
pHurt->pev->punchangle.z = -18; pHurt->pev->punchangle.z = -18;
@ -356,7 +356,7 @@ void CArcher::MonsterThink( void )
void CArcher::Stop( void ) void CArcher::Stop( void )
{ {
if( !m_bOnAttack ) if( !m_bOnAttack )
m_flightSpeed = 40.0; m_flightSpeed = 40.0f;
} }
void CArcher::Swim() void CArcher::Swim()
@ -391,7 +391,7 @@ void CArcher::Swim()
if( m_IdealActivity == ACT_RUN ) if( m_IdealActivity == ACT_RUN )
SetActivity( ACT_WALK ); SetActivity( ACT_WALK );
if( m_IdealActivity == ACT_WALK ) if( m_IdealActivity == ACT_WALK )
pev->framerate = m_flightSpeed / 150.0; pev->framerate = m_flightSpeed / 150.0f;
// ALERT( at_console, "walk %.2f\n", pev->framerate ); // ALERT( at_console, "walk %.2f\n", pev->framerate );
} }
else else
@ -399,7 +399,7 @@ void CArcher::Swim()
if( m_IdealActivity == ACT_WALK ) if( m_IdealActivity == ACT_WALK )
SetActivity( ACT_RUN ); SetActivity( ACT_RUN );
if( m_IdealActivity == ACT_RUN) if( m_IdealActivity == ACT_RUN)
pev->framerate = m_flightSpeed / 75.0; pev->framerate = m_flightSpeed / 75.0f;
// ALERT( at_console, "run %.2f\n", pev->framerate ); // ALERT( at_console, "run %.2f\n", pev->framerate );
} }
/* /*
@ -432,10 +432,10 @@ void CArcher::Swim()
// ALERT( at_console, "%f : %f\n", Angles.x, Forward.z ); // ALERT( at_console, "%f : %f\n", Angles.x, Forward.z );
float flDot = DotProduct( Forward, m_SaveVelocity ); float flDot = DotProduct( Forward, m_SaveVelocity );
if( flDot > 0.5 ) if( flDot > 0.5f )
pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed; pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed;
else if( flDot > 0 ) else if( flDot > 0.0f )
pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed * ( flDot + 0.5 ); pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed * ( flDot + 0.5f );
else else
pev->velocity = m_SaveVelocity = m_SaveVelocity * 40; pev->velocity = m_SaveVelocity = m_SaveVelocity * 40;
@ -454,7 +454,7 @@ void CArcher::Swim()
// //
if( Angles.x > 180 ) if( Angles.x > 180 )
Angles.x = Angles.x - 360; Angles.x = Angles.x - 360;
pev->angles.x = UTIL_Approach( Angles.x, pev->angles.x, 50 * 0.1 ); pev->angles.x = UTIL_Approach( Angles.x, pev->angles.x, 50 * 0.1f );
if( pev->angles.x < -180 ) if( pev->angles.x < -180 )
pev->angles.x = -180; pev->angles.x = -180;
if( pev->angles.x > 180 ) if( pev->angles.x > 180 )
@ -478,12 +478,12 @@ void CArcher::Swim()
turn = Angles.y - pev->angles.y - 360; turn = Angles.y - pev->angles.y - 360;
} }
float speed = m_flightSpeed * 0.1; float speed = m_flightSpeed * 0.1f;
// ALERT( at_console, "speed %.0f %f\n", turn, speed ); // ALERT( at_console, "speed %.0f %f\n", turn, speed );
if( fabs( turn ) > speed ) if( fabs( turn ) > speed )
{ {
if( turn < 0.0 ) if( turn < 0.0f )
{ {
turn = -speed; turn = -speed;
} }
@ -494,15 +494,15 @@ void CArcher::Swim()
} }
pev->angles.y += turn; pev->angles.y += turn;
pev->angles.z -= turn; pev->angles.z -= turn;
pev->angles.y = fmod( ( pev->angles.y + 360.0 ), 360.0 ); pev->angles.y = fmod( ( pev->angles.y + 360.0f ), 360.0f );
static float yaw_adj; static float yaw_adj;
yaw_adj = yaw_adj * 0.8 + turn; yaw_adj = yaw_adj * 0.8f + turn;
// ALERT( at_console, "yaw %f : %f\n", turn, yaw_adj ); // ALERT( at_console, "yaw %f : %f\n", turn, yaw_adj );
SetBoneController( 0, -yaw_adj / 4.0 ); SetBoneController( 0, -yaw_adj * 0.25f );
// Roll Smoothing // Roll Smoothing
// //
@ -519,7 +519,7 @@ void CArcher::Swim()
{ {
turn = Angles.z - pev->angles.z - 360; turn = Angles.z - pev->angles.z - 360;
} }
speed = m_flightSpeed / 2 * 0.1; speed = m_flightSpeed / 2 * 0.1f;
if( fabs( turn ) < speed ) if( fabs( turn ) < speed )
{ {
@ -527,7 +527,7 @@ void CArcher::Swim()
} }
else else
{ {
if( turn < 0.0 ) if( turn < 0.0f )
{ {
pev->angles.z -= speed; pev->angles.z -= speed;
} }

2
dlls/asheep/barniel.cpp
View File

@ -209,7 +209,7 @@ static BOOL IsFacing( entvars_t *pevTest, const Vector &reference )
UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL ); UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL );
// He's facing me, he meant it // 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; return TRUE;
} }

10
dlls/asheep/beretta.cpp
View File

@ -244,20 +244,20 @@ void CBeretta::WeaponIdle( void )
int iAnim; int iAnim;
float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0.0, 1.0 ); float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0.0, 1.0 );
if (flRand <= 0.3 + 0 * 0.75) if (flRand <= 0.3f)
{ {
iAnim = BERETTA_IDLE3; iAnim = BERETTA_IDLE3;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 49.0 / 16; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 49.0f / 16.0f;
} }
else if (flRand <= 0.6 + 0 * 0.875) else if (flRand <= 0.6f)
{ {
iAnim = BERETTA_IDLE1; iAnim = BERETTA_IDLE1;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 60.0 / 16.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 60.0f / 16.0f;
} }
else else
{ {
iAnim = BERETTA_IDLE2; iAnim = BERETTA_IDLE2;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 40.0 / 16.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 40.0f / 16.0f;
} }
SendWeaponAnim( iAnim, 1 ); SendWeaponAnim( iAnim, 1 );
} }

6
dlls/asheep/gordonnadrian.cpp
View File

@ -98,7 +98,7 @@ CBaseEntity* CGordon::AdrianCheckTraceHullAttack( float flDist, int iDamage, int
UTIL_MakeVectors( pev->angles ); UTIL_MakeVectors( pev->angles );
Vector vecStart = pev->origin; Vector vecStart = pev->origin;
vecStart.z += pev->size.z * 0.5; vecStart.z += pev->size.z * 0.5f;
Vector vecEnd = vecStart + ( gpGlobals->v_forward * flDist ); Vector vecEnd = vecStart + ( gpGlobals->v_forward * flDist );
UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT( pev ), &tr ); UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT( pev ), &tr );
@ -123,7 +123,7 @@ BOOL CGordon::CheckMeleeAttack1( float flDot, float flDist )
} }
} }
if( flDist <= 64 && flDot >= 0.7 && if( flDist <= 64 && flDot >= 0.7f &&
pEnemy->Classify() != CLASS_ALIEN_BIOWEAPON && pEnemy->Classify() != CLASS_ALIEN_BIOWEAPON &&
pEnemy->Classify() != CLASS_PLAYER_BIOWEAPON ) pEnemy->Classify() != CLASS_PLAYER_BIOWEAPON )
{ {
@ -307,7 +307,7 @@ static BOOL IsFacing( entvars_t *pevTest, const Vector &reference )
UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL ); UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL );
// He's facing me, he meant it // 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; return TRUE;
} }

6
dlls/asheep/kate.cpp
View File

@ -103,7 +103,7 @@ CBaseEntity* CKate::CheckTraceHullAttack( float flDist, int iDamage, int iDmgTyp
UTIL_MakeVectors( pev->angles ); UTIL_MakeVectors( pev->angles );
Vector vecStart = pev->origin; Vector vecStart = pev->origin;
vecStart.z += pev->size.z * 0.5; vecStart.z += pev->size.z * 0.5f;
Vector vecEnd = vecStart + ( gpGlobals->v_forward * flDist ); Vector vecEnd = vecStart + ( gpGlobals->v_forward * flDist );
UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT( pev ), &tr ); UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT( pev ), &tr );
@ -128,7 +128,7 @@ BOOL CKate::CheckMeleeAttack1( float flDot, float flDist )
} }
} }
if( flDist <= 64 && flDot >= 0.7 && if( flDist <= 64 && flDot >= 0.7f &&
pEnemy->Classify() != CLASS_ALIEN_BIOWEAPON && pEnemy->Classify() != CLASS_ALIEN_BIOWEAPON &&
pEnemy->Classify() != CLASS_PLAYER_BIOWEAPON ) pEnemy->Classify() != CLASS_PLAYER_BIOWEAPON )
{ {
@ -319,7 +319,7 @@ static BOOL IsFacing( entvars_t *pevTest, const Vector &reference )
UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL ); UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL );
// He's facing me, he meant it // 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; return TRUE;
} }

6
dlls/asheep/kmedkit.cpp
View File

@ -185,10 +185,10 @@ void CKMedKit::UseMedkit( int fMode )
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
@ -203,7 +203,7 @@ void CKMedKit::UseMedkit( int fMode )
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
if( tr.flFraction < 1.0 ) if( tr.flFraction < 1.0f )
{ {
CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit ); CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
if( pEntity ) if( pEntity )

24
dlls/asheep/m41a.cpp
View File

@ -136,14 +136,14 @@ void CM41A::PrimaryAttack()
if (m_pPlayer->pev->waterlevel == 3) if (m_pPlayer->pev->waterlevel == 3)
{ {
PlayEmptySound( ); PlayEmptySound( );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
if (m_iClip <= 0) if (m_iClip <= 0)
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
@ -190,10 +190,10 @@ void CM41A::PrimaryAttack()
// HEV suit - indicate out of ammo condition // HEV suit - indicate out of ammo condition
m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0); m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1f;
if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() ) if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
} }
@ -212,7 +212,7 @@ void CM41A::SecondaryAttack( void )
if (m_pPlayer->pev->waterlevel == 3) if (m_pPlayer->pev->waterlevel == 3)
{ {
PlayEmptySound( ); PlayEmptySound( );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return; return;
} }
@ -226,7 +226,7 @@ void CM41A::SecondaryAttack( void )
m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH; m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
m_pPlayer->m_iExtraSoundTypes = bits_SOUND_DANGER; m_pPlayer->m_iExtraSoundTypes = bits_SOUND_DANGER;
m_pPlayer->m_flStopExtraSoundTime = UTIL_WeaponTimeBase() + 0.2; m_pPlayer->m_flStopExtraSoundTime = UTIL_WeaponTimeBase() + 0.2f;
m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType]--; m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType]--;
@ -242,12 +242,12 @@ void CM41A::SecondaryAttack( void )
// we don't add in player velocity anymore. // we don't add in player velocity anymore.
CGrenade::ShootContact( m_pPlayer->pev, CGrenade::ShootContact( m_pPlayer->pev,
m_pPlayer->pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_forward * 16, m_pPlayer->pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_forward * 16,
gpGlobals->v_forward * 800, gSkillData.plrDmgM41AGrenade ); gpGlobals->v_forward * 800, gSkillData.plrDmgM41AGrenade );
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.0f;
m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1; m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.0f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5;// idle pretty soon after shooting. m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5.0f;// idle pretty soon after shooting.
if (!m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType]) if (!m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType])
// HEV suit - indicate out of ammo condition // HEV suit - indicate out of ammo condition
@ -267,7 +267,7 @@ void CM41A::Reload( void )
if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == MP5_MAX_CLIP ) if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == MP5_MAX_CLIP )
return; return;
DefaultReload( MP5_MAX_CLIP, M41A_RELOAD, 2.0 ); DefaultReload( MP5_MAX_CLIP, M41A_RELOAD, 2.0f );
} }

2
dlls/asheep/panther.cpp
View File

@ -405,7 +405,7 @@ void CPanther::ArmBeam( int side )
} }
// Couldn't find anything close enough // Couldn't find anything close enough
if( flDist == 1.0 ) if( flDist == 1.0f )
return; return;
DecalGunshot( &tr, BULLET_PLAYER_CROWBAR ); DecalGunshot( &tr, BULLET_PLAYER_CROWBAR );

28
dlls/asheep/poolstick.cpp
View File

@ -119,7 +119,7 @@ extern void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *
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;
@ -136,7 +136,7 @@ extern void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *
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 )
@ -162,7 +162,7 @@ void CPoolstick::PrimaryAttack()
if (! Swing( 1 )) if (! Swing( 1 ))
{ {
SetThink( &CPoolstick::SwingAgain ); SetThink( &CPoolstick::SwingAgain );
pev->nextthink = gpGlobals->time + 0.1; pev->nextthink = gpGlobals->time + 0.1f;
} }
} }
@ -192,10 +192,10 @@ int CPoolstick::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,7 +207,7 @@ int CPoolstick::Swing( int fFirst )
} }
#endif #endif
if ( tr.flFraction >= 1.0 ) if ( tr.flFraction >= 1.0f )
{ {
if (fFirst) if (fFirst)
{ {
@ -224,7 +224,7 @@ int CPoolstick::Swing( int fFirst )
SendWeaponAnim( POOLSTICK_ATTACK3MISS ); SendWeaponAnim( POOLSTICK_ATTACK3MISS );
break; break;
} }
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f;
EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/pstk_miss1.wav", 1, ATTN_NORM, 0, 94 + RANDOM_LONG( 0, 0xF ) ); EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/pstk_miss1.wav", 1, ATTN_NORM, 0, 94 + RANDOM_LONG( 0, 0xF ) );
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
@ -325,10 +325,10 @@ int CPoolstick::Swing( int fFirst )
} }
m_pPlayer->m_iWeaponVolume = flVol * POOLSTICK_WALLHIT_VOLUME; m_pPlayer->m_iWeaponVolume = flVol * POOLSTICK_WALLHIT_VOLUME;
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
SetThink( &CPoolstick::Smack ); SetThink( &CPoolstick::Smack );
pev->nextthink = UTIL_WeaponTimeBase() + 0.2; pev->nextthink = UTIL_WeaponTimeBase() + 0.2f;
} }
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
return fDidHit; return fDidHit;
@ -350,22 +350,22 @@ void CPoolstick::WeaponIdle()
{ {
int iAnim; int iAnim;
float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 ); float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
if( flRand > 0.9 ) if( flRand > 0.9f )
{ {
iAnim = POOLSTICK_IDLE2; iAnim = POOLSTICK_IDLE2;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0 / 30.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
} }
else else
{ {
if( flRand > 0.5 ) if( flRand > 0.5f )
{ {
iAnim = POOLSTICK_IDLE; iAnim = POOLSTICK_IDLE;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0 / 30.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0f / 30.0f;
} }
else else
{ {
iAnim = POOLSTICK_IDLE3; iAnim = POOLSTICK_IDLE3;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0 / 30.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
} }
} }
SendWeaponAnim( iAnim ); SendWeaponAnim( iAnim );

2
dlls/asheep/spforce.cpp
View File

@ -573,7 +573,7 @@ void CSPForceRepel::RepelUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, US
pBeam->SetFlags( BEAM_FSOLID ); pBeam->SetFlags( BEAM_FSOLID );
pBeam->SetColor( 255, 255, 255 ); pBeam->SetColor( 255, 255, 255 );
pBeam->SetThink( &CBeam::SUB_Remove ); pBeam->SetThink( &CBeam::SUB_Remove );
pBeam->pev->nextthink = gpGlobals->time + -4096.0 * tr.flFraction / pSPForce->pev->velocity.z + 0.5; pBeam->pev->nextthink = gpGlobals->time + -4096.0f * tr.flFraction / pSPForce->pev->velocity.z + 0.5f;
UTIL_Remove( this ); UTIL_Remove( this );
} }

2
dlls/asheep/terror.cpp
View File

@ -989,7 +989,7 @@ void CTerrorRepel::RepelUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE
pBeam->SetFlags( BEAM_FSOLID ); pBeam->SetFlags( BEAM_FSOLID );
pBeam->SetColor( 255, 255, 255 ); pBeam->SetColor( 255, 255, 255 );
pBeam->SetThink( &CBeam::SUB_Remove ); pBeam->SetThink( &CBeam::SUB_Remove );
pBeam->pev->nextthink = gpGlobals->time + -4096.0 * tr.flFraction / pTerror->pev->velocity.z + 0.5; pBeam->pev->nextthink = gpGlobals->time + -4096.0f * tr.flFraction / pTerror->pev->velocity.z + 0.5f;
UTIL_Remove( this ); UTIL_Remove( this );
} }

76
dlls/asheep/toad.cpp
View File

@ -86,7 +86,7 @@ TYPEDESCRIPTION CToadGrenade::m_SaveData[] =
IMPLEMENT_SAVERESTORE( CToadGrenade, CGrenade ); IMPLEMENT_SAVERESTORE( CToadGrenade, CGrenade );
#define TOAD_DETONATE_DELAY 15.0 #define TOAD_DETONATE_DELAY 15.0f
int CToadGrenade :: Classify ( void ) int CToadGrenade :: Classify ( void )
{ {
@ -123,14 +123,14 @@ void CToadGrenade :: Spawn( void )
SetTouch( &CToadGrenade::SuperBounceTouch ); SetTouch( &CToadGrenade::SuperBounceTouch );
SetThink( &CToadGrenade::HuntThink ); SetThink( &CToadGrenade::HuntThink );
pev->nextthink = gpGlobals->time + 0.1; pev->nextthink = gpGlobals->time + 0.1f;
m_flNextHunt = gpGlobals->time + 1E6; m_flNextHunt = gpGlobals->time + (float)1E6;
pev->flags |= FL_MONSTER; pev->flags |= FL_MONSTER;
pev->takedamage = DAMAGE_AIM; pev->takedamage = DAMAGE_AIM;
pev->health = gSkillData.toadHealth; pev->health = gSkillData.toadHealth;
pev->gravity = 0.5; pev->gravity = 0.5f;
pev->friction = 0.5; pev->friction = 0.5f;
pev->dmg = gSkillData.toadDmgPop; pev->dmg = gSkillData.toadDmgPop;
@ -166,7 +166,7 @@ void CToadGrenade :: Killed( entvars_t *pevAttacker, int iGib )
SetThink( &CToadGrenade::SUB_Remove ); SetThink( &CToadGrenade::SUB_Remove );
// ResetTouch( ); // ResetTouch( );
SetTouch( NULL ); SetTouch( NULL );
pev->nextthink = gpGlobals->time + 0.1; pev->nextthink = gpGlobals->time + 0.1f;
// since toad grenades never leave a body behind, clear out their takedamage now. // since toad grenades never leave a body behind, clear out their takedamage now.
// Squeaks do a bit of radius damage when they pop, and that radius damage will // Squeaks do a bit of radius damage when they pop, and that radius damage will
@ -197,8 +197,6 @@ void CToadGrenade :: GibMonster( void )
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200);
} }
void CToadGrenade::HuntThink( void ) void CToadGrenade::HuntThink( void )
{ {
// ALERT( at_console, "think\n" ); // ALERT( at_console, "think\n" );
@ -212,7 +210,7 @@ void CToadGrenade::HuntThink( void )
} }
StudioFrameAdvance( ); StudioFrameAdvance( );
pev->nextthink = gpGlobals->time + 0.1; pev->nextthink = gpGlobals->time + 0.1f;
// explode when ready // explode when ready
if (gpGlobals->time >= m_flDie) if (gpGlobals->time >= m_flDie)
@ -230,8 +228,8 @@ void CToadGrenade::HuntThink( void )
{ {
pev->movetype = MOVETYPE_FLY; pev->movetype = MOVETYPE_FLY;
} }
pev->velocity = pev->velocity * 0.9; pev->velocity = pev->velocity * 0.9f;
pev->velocity.z += 8.0; pev->velocity.z += 8.0f;
} }
else if (pev->movetype == MOVETYPE_FLY) else if (pev->movetype == MOVETYPE_FLY)
{ {
@ -242,8 +240,8 @@ void CToadGrenade::HuntThink( void )
if (m_flNextHunt > gpGlobals->time) if (m_flNextHunt > gpGlobals->time)
return; return;
m_flNextHunt = gpGlobals->time + 2.0; m_flNextHunt = gpGlobals->time + 2.0f;
CBaseEntity *pOther = 0; CBaseEntity *pOther = 0;
Vector vecDir; Vector vecDir;
TraceResult tr; TraceResult tr;
@ -262,14 +260,14 @@ void CToadGrenade::HuntThink( void )
} }
// squeek if it's about time blow up // squeek if it's about time blow up
if ((m_flDie - gpGlobals->time <= 0.5) && (m_flDie - gpGlobals->time >= 0.3)) if ((m_flDie - gpGlobals->time <= 0.5f) && (m_flDie - gpGlobals->time >= 0.3f))
{ {
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_die1.wav", 1, ATTN_NORM, 0, 100 + RANDOM_LONG(0,0x3F)); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_die1.wav", 1, ATTN_NORM, 0, 100 + RANDOM_LONG(0,0x3F));
CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 ); CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 );
} }
// higher pitch as squeeker gets closer to detonation time // higher pitch as squeeker gets closer to detonation time
float flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / TOAD_DETONATE_DELAY); float flpitch = 155.0f - 60.0f * ((m_flDie - gpGlobals->time) / TOAD_DETONATE_DELAY);
if (flpitch < 80) if (flpitch < 80)
flpitch = 80; flpitch = 80;
@ -282,10 +280,10 @@ void CToadGrenade::HuntThink( void )
} }
float flVel = pev->velocity.Length(); float flVel = pev->velocity.Length();
float flAdj = 50.0 / (flVel + 10.0); float flAdj = 50.0f / (flVel + 10.0f);
if (flAdj > 1.2) if (flAdj > 1.2f)
flAdj = 1.2; flAdj = 1.2f;
// ALERT( at_console, "think : enemy\n"); // ALERT( at_console, "think : enemy\n");
@ -307,7 +305,7 @@ void CToadGrenade::HuntThink( void )
} }
} }
if ((pev->origin - m_posPrev).Length() < 1.0) if ((pev->origin - m_posPrev).Length() < 1.0f)
{ {
pev->velocity.x = RANDOM_FLOAT( -100, 100 ); pev->velocity.x = RANDOM_FLOAT( -100, 100 );
pev->velocity.y = RANDOM_FLOAT( -100, 100 ); pev->velocity.y = RANDOM_FLOAT( -100, 100 );
@ -341,7 +339,7 @@ void CToadGrenade::SuperBounceTouch( CBaseEntity *pOther )
return; return;
// higher pitch as squeeker gets closer to detonation time // higher pitch as squeeker gets closer to detonation time
flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / TOAD_DETONATE_DELAY); flpitch = 155.0f - 60.0f * ((m_flDie - gpGlobals->time) / TOAD_DETONATE_DELAY);
if ( pOther->pev->takedamage && m_flNextAttack < gpGlobals->time ) if ( pOther->pev->takedamage && m_flNextAttack < gpGlobals->time )
{ {
@ -366,7 +364,7 @@ void CToadGrenade::SuperBounceTouch( CBaseEntity *pOther )
// make bite sound // make bite sound
EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, "toad/toad_deploy1.wav", 1.0, ATTN_NORM, 0, (int)flpitch); EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, "toad/toad_deploy1.wav", 1.0, ATTN_NORM, 0, (int)flpitch);
m_flNextAttack = gpGlobals->time + 0.5; m_flNextAttack = gpGlobals->time + 0.5f;
} }
} }
else else
@ -375,7 +373,7 @@ void CToadGrenade::SuperBounceTouch( CBaseEntity *pOther )
} }
} }
m_flNextHit = gpGlobals->time + 0.1; m_flNextHit = gpGlobals->time + 0.1f;
m_flNextHunt = gpGlobals->time; m_flNextHunt = gpGlobals->time;
if ( g_pGameRules->IsMultiplayer() ) if ( g_pGameRules->IsMultiplayer() )
@ -393,9 +391,9 @@ void CToadGrenade::SuperBounceTouch( CBaseEntity *pOther )
// play bounce sound // play bounce sound
float flRndSound = RANDOM_FLOAT ( 0 , 1 ); float flRndSound = RANDOM_FLOAT ( 0 , 1 );
if ( flRndSound <= 0.33 ) if ( flRndSound <= 0.33f )
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt1.wav", 1, ATTN_NORM, 0, (int)flpitch); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt1.wav", 1, ATTN_NORM, 0, (int)flpitch);
else if (flRndSound <= 0.66) else if (flRndSound <= 0.66f)
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, (int)flpitch); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, (int)flpitch);
else else
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, (int)flpitch); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, (int)flpitch);
@ -407,7 +405,7 @@ void CToadGrenade::SuperBounceTouch( CBaseEntity *pOther )
CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 100, 0.1 ); CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 100, 0.1 );
} }
m_flNextBounceSoundTime = gpGlobals->time + 0.5;// half second. m_flNextBounceSoundTime = gpGlobals->time + 0.5f;// half second.
} }
#endif #endif
@ -427,7 +425,7 @@ void CToad::Spawn( )
pev->sequence = 1; pev->sequence = 1;
pev->animtime = gpGlobals->time; pev->animtime = gpGlobals->time;
pev->framerate = 1.0; pev->framerate = 1.0f;
SetThink( &CToad::ToadIdle ); SetThink( &CToad::ToadIdle );
pev->nextthink = gpGlobals->time + 0.2f; pev->nextthink = gpGlobals->time + 0.2f;
@ -474,7 +472,7 @@ BOOL CToad::Deploy( )
// play hunt sound // play hunt sound
float flRndSound = RANDOM_FLOAT( 0, 1 ); float flRndSound = RANDOM_FLOAT( 0, 1 );
if ( flRndSound <= 0.5 ) if( flRndSound <= 0.5f )
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, 100); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, 100);
else else
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, 100); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, 100);
@ -482,20 +480,20 @@ BOOL CToad::Deploy( )
m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME; m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
} }
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.1; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.1f;
return DefaultDeploy( "models/v_toad.mdl", "models/p_toad.mdl", TOAD_UP, "toad" ); return DefaultDeploy( "models/v_toad.mdl", "models/p_toad.mdl", TOAD_UP, "toad" );
} }
void CToad::Holster( int skiplocal /* = 0 */ ) void CToad::Holster( int skiplocal /* = 0 */ )
{ {
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5f;
if ( !m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] ) if( !m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
{ {
m_pPlayer->pev->weapons &= ~(1<<WEAPON_TOAD); m_pPlayer->pev->weapons &= ~(1<<WEAPON_TOAD);
SetThink( &CToad::DestroyItem ); SetThink( &CToad::DestroyItem );
pev->nextthink = gpGlobals->time + 0.1; pev->nextthink = gpGlobals->time + 0.1f;
return; return;
} }
@ -512,7 +510,7 @@ void CToad::PrimaryAttack()
return; return;
} }
if ( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] ) if( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
{ {
UTIL_MakeVectors( m_pPlayer->pev->v_angle ); UTIL_MakeVectors( m_pPlayer->pev->v_angle );
TraceResult tr; TraceResult tr;
@ -521,7 +519,7 @@ void CToad::PrimaryAttack()
// HACK HACK: Ugly hacks to handle change in origin based on new physics code for players // HACK HACK: Ugly hacks to handle change in origin based on new physics code for players
// Move origin up if crouched and start trace a bit outside of body ( 20 units instead of 16 ) // Move origin up if crouched and start trace a bit outside of body ( 20 units instead of 16 )
trace_origin = m_pPlayer->pev->origin; trace_origin = m_pPlayer->pev->origin;
if ( m_pPlayer->pev->flags & FL_DUCKING ) if( m_pPlayer->pev->flags & FL_DUCKING )
{ {
trace_origin = trace_origin - ( VEC_HULL_MIN - VEC_DUCK_HULL_MIN ); trace_origin = trace_origin - ( VEC_HULL_MIN - VEC_DUCK_HULL_MIN );
} }
@ -529,7 +527,7 @@ void CToad::PrimaryAttack()
// find place to toss monster // find place to toss monster
UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20, trace_origin + gpGlobals->v_forward * 64, dont_ignore_monsters, NULL, &tr ); UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20, trace_origin + gpGlobals->v_forward * 64, dont_ignore_monsters, NULL, &tr );
if ( tr.fAllSolid == 0 && tr.fStartSolid == 0 && tr.flFraction > 0.25 ) if( tr.fAllSolid == 0 && tr.fStartSolid == 0 && tr.flFraction > 0.25f )
{ {
SendWeaponAnim( TOAD_THROW ); SendWeaponAnim( TOAD_THROW );
@ -542,9 +540,9 @@ void CToad::PrimaryAttack()
#endif #endif
// play hunt sound // play hunt sound
float flRndSound = RANDOM_FLOAT ( 0 , 1 ); float flRndSound = RANDOM_FLOAT( 0 , 1 );
if ( flRndSound <= 0.5 ) if( flRndSound <= 0.5f )
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, 105); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt2.wav", 1, ATTN_NORM, 0, 105);
else else
EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, 105); EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "toad/toad_hunt3.wav", 1, ATTN_NORM, 0, 105);
@ -555,8 +553,8 @@ void CToad::PrimaryAttack()
m_fJustThrown = 1; m_fJustThrown = 1;
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.3; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.3f;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0f;
} }
} }
} }

2
dlls/crossbow.cpp
View File

@ -415,7 +415,7 @@ void CCrossbow::FireSniperBolt()
if( FClassnameIs( tr.pHit, "worldspawn" ) ) if( FClassnameIs( tr.pHit, "worldspawn" ) )
{ {
// let the bolt sit around for a while if it hit static architecture // let the bolt sit around for a while if it hit static architecture
pBolt->pev->nextthink = gpGlobals->time + 5.0; pBolt->pev->nextthink = gpGlobals->time + 5.0f;
} }
else else
{ {

7
dlls/crowbar.cpp
View File

@ -217,7 +217,7 @@ int CCrowbar::Swing( int fFirst )
SendWeaponAnim( CROWBAR_ATTACK3MISS ); SendWeaponAnim( CROWBAR_ATTACK3MISS );
break; break;
} }
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5f;
EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/cbar_miss1.wav", 1, ATTN_NORM, 0, 94 + RANDOM_LONG( 0, 0xF ) ); EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/cbar_miss1.wav", 1, ATTN_NORM, 0, 94 + RANDOM_LONG( 0, 0xF ) );
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
// player "shoot" animation // player "shoot" animation
@ -339,11 +339,6 @@ int CCrowbar::Swing( int fFirst )
SetThink( &CCrowbar::Smack ); SetThink( &CCrowbar::Smack );
pev->nextthink = UTIL_WeaponTimeBase() + 0.2f; pev->nextthink = UTIL_WeaponTimeBase() + 0.2f;
#endif
#if CROWBAR_DELAY_FIX
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
#else
m_flNextPrimaryAttack = GetNextAttackDelay( 0.25f );
#endif #endif
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
} }

2
dlls/hornetgun.cpp
View File

@ -227,7 +227,7 @@ void CHgun::SecondaryAttack( void )
m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME; m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH; m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
m_flRechargeTime = gpGlobals->time + 0.5; m_flRechargeTime = gpGlobals->time + 0.5f;
SendWeaponAnim( HGUN_SHOOT ); SendWeaponAnim( HGUN_SHOOT );

2
dlls/items.cpp
View File

@ -291,7 +291,7 @@ class CItemBattery : public CItem
{ {
EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "barney/nope.wav", 1, ATTN_NORM ); EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "barney/nope.wav", 1, ATTN_NORM );
UTIL_ShowMessageAll( "NOHEVBATTERY" ); UTIL_ShowMessageAll( "NOHEVBATTERY" );
NextMessageTime = gpGlobals->time + 4.0; NextMessageTime = gpGlobals->time + 4.0f;
} }
return FALSE; return FALSE;
} }

8
dlls/rat.cpp
View File

@ -165,7 +165,7 @@ void CRat::HandleAnimEvent( MonsterEvent_t *pEvent )
// Scale the sideways velocity to get there at the right time // Scale the sideways velocity to get there at the right time
vecJumpDir = m_hEnemy->pev->origin + m_hEnemy->pev->view_ofs - pev->origin; vecJumpDir = m_hEnemy->pev->origin + m_hEnemy->pev->view_ofs - pev->origin;
vecJumpDir = vecJumpDir * ( 1.0 / time ); vecJumpDir = vecJumpDir * ( 1.0f / time );
// Speed to offset gravity at the desired height // Speed to offset gravity at the desired height
vecJumpDir.z = speed; vecJumpDir.z = speed;
@ -173,9 +173,9 @@ void CRat::HandleAnimEvent( MonsterEvent_t *pEvent )
// Don't jump too far/fast // Don't jump too far/fast
float distance = vecJumpDir.Length(); float distance = vecJumpDir.Length();
if( distance > 650 ) if( distance > 650.0f )
{ {
vecJumpDir = vecJumpDir * ( 650.0 / distance ); vecJumpDir = vecJumpDir * ( 650.0f / distance );
} }
} }
else else
@ -188,7 +188,7 @@ void CRat::HandleAnimEvent( MonsterEvent_t *pEvent )
EMIT_SOUND_DYN( edict(), CHAN_VOICE, pAttackSounds[0], GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() ); EMIT_SOUND_DYN( edict(), CHAN_VOICE, pAttackSounds[0], GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
pev->velocity = vecJumpDir; pev->velocity = vecJumpDir;
m_flNextAttack = gpGlobals->time + 2; m_flNextAttack = gpGlobals->time + 2.0f;
} }
break; break;
default: default:

4
dlls/triggers.cpp
View File

@ -2502,9 +2502,9 @@ void CTriggerKateHealth::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE
CBaseEntity *pEntity = UTIL_FindEntityByTargetname( 0, STRING( m_szKateName ) ); CBaseEntity *pEntity = UTIL_FindEntityByTargetname( 0, STRING( m_szKateName ) );
if( pEntity ) if( pEntity )
{ {
ALERT( at_console, "trigger_katehealth: Kate health before: %f\n", pEntity->pev->health ); ALERT( at_console, "trigger_katehealth: Kate health before: %f\n", (double)pEntity->pev->health );
pEntity->pev->health = gSkillData.kateHealth; pEntity->pev->health = gSkillData.kateHealth;
ALERT( at_console, "trigger_katehealth: Kate health after: %f\n", pEntity->pev->health ); ALERT( at_console, "trigger_katehealth: Kate health after: %f\n", (double)pEntity->pev->health );
} }
else else
{ {

2
dlls/tripmine.cpp
View File

@ -475,7 +475,7 @@ void CTripmine::PrimaryAttack( void )
}*/ }*/
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.3; m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.3f;
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/util.cpp
View File

@ -78,7 +78,7 @@ void UTIL_CreateWarpball( edict_t *ent, Vector vecSrc, float spawnVol, float spa
UTIL_TraceLine( vecSrc, vecSrc + vecDir * 1024, ignore_monsters, ent, &tr ); UTIL_TraceLine( vecSrc, vecSrc + vecDir * 1024, ignore_monsters, ent, &tr );
vecEnd = tr.vecEndPos; vecEnd = tr.vecEndPos;
if( ( vecEnd - vecSrc ).Length() >= ( 1024 * 0.1f ) && tr.flFraction != 1.0 ) if( ( vecEnd - vecSrc ).Length() >= ( 1024 * 0.1f ) && tr.flFraction != 1.0f )
{ {
MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY ); MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
WRITE_BYTE( TE_BEAMPOINTS ); WRITE_BYTE( TE_BEAMPOINTS );

2
dlls/zombie.cpp
View File

@ -276,7 +276,7 @@ void CZombie::Spawn()
if( FClassnameIs( pev, "monster_zombie" ) ) if( FClassnameIs( pev, "monster_zombie" ) )
pev->health = gSkillData.zombieHealth; pev->health = gSkillData.zombieHealth;
else else
pev->health = gSkillData.zombieHealth * 1.25; pev->health = gSkillData.zombieHealth * 1.25f;
pev->view_ofs = VEC_VIEW;// position of the eyes relative to monster's origin. pev->view_ofs = VEC_VIEW;// position of the eyes relative to monster's origin.
m_flFieldOfView = 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result ) m_flFieldOfView = 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
m_MonsterState = MONSTERSTATE_NONE; m_MonsterState = MONSTERSTATE_NONE;