Skip to content

Commit bffd54a

Browse files
committed
TODO: receive val from server.
1 parent 8da2b46 commit bffd54a

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

dlls/gauss.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,7 @@ LINK_ENTITY_TO_CLASS( weapon_gauss, CGauss );
4545

4646
float CGauss::GetFullChargeTime( void )
4747
{
48-
#ifdef CLIENT_DLL
49-
if ( bIsMultiplayer() )
50-
#else
51-
if ( g_pGameRules->IsMultiplayer() )
52-
#endif
53-
{
54-
return 1.5;
55-
}
56-
57-
return 4;
48+
return 20;
5849
}
5950

6051
#ifdef CLIENT_DLL
@@ -277,7 +268,7 @@ void CGauss::SecondaryAttack()
277268
m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_CHARGE_VOLUME;
278269

279270
// m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.1;
280-
if ( m_pPlayer->m_flStartCharge < gpGlobals->time - 10 )
271+
if ( GetFullChargeTime() + m_pPlayer->m_flStartCharge < gpGlobals->time - 10 )
281272
{
282273
// Player charged up too long. Zap him.
283274
EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro4.wav", 1.0, ATTN_NORM, 0, 80 + RANDOM_LONG(0,0x3f));

0 commit comments

Comments
 (0)