fix firing speed again, mvm fixes

Author: mastercoms

game/client/tf/tf_hud_tournament.cpp

@@ -130,7 +130,7 @@ void CHudTournament::Init( void )
 	m_flNextUpdate = gpGlobals->curtime;
 }
 
-ConVar tf_force_mannup_sound("tf_force_mannup_sound", "0", FCVAR_DEVELOPMENTONLY);
+ConVar tf_force_mannup_sound("tf_force_mannup_sound", "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED);
 
 //-----------------------------------------------------------------------------
 // Purpose: 

game/server/tf/player_vs_environment/tf_populators.cpp

@@ -2119,7 +2119,7 @@ void CWave::ActiveWaveUpdate( void )
 	}
 }
 
-ConVar tf_force_mannup_sound("tf_force_mannup_sound", "0", FCVAR_DEVELOPMENTONLY);
+ConVar tf_force_mannup_sound("tf_force_mannup_sound", "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED);
 
 //-------------------------------------------------------------------------
 void CWave::WaveCompleteUpdate( void )

game/server/tf/tf_gc_server.cpp

@@ -1593,7 +1593,7 @@ void CTFGCServerSystem::ClientDisconnected( CSteamID steamIDClient )
 	}
 }
 
-ConVar tf_sv_mvm_forced_players("tf_sv_mvm_forced_players", "0", FCVAR_REPLICATED);
+extern ConVar tf_sv_mvm_forced_players;
 
 //-----------------------------------------------------------------------------
 void CTFGCServerSystem::PreClientUpdate( )

game/server/tf/tf_obj_sentrygun.cpp

@@ -1281,11 +1281,11 @@ void CObjectSentrygun::Attack()
 		if ( m_iUpgradeLevel == 1 )
 		{
 			// Level 1 sentries fire slower
-			m_flNextAttack = gpGlobals->curtime + (0.2f*m_flFireRate);
+			m_flNextAttack += (0.2f*m_flFireRate);
 		}
 		else
 		{
-			m_flNextAttack = gpGlobals->curtime + (0.1f*m_flFireRate);
+			m_flNextAttack += (0.1f*m_flFireRate);
 		}
 	}
 	else

game/shared/basecombatweapon_shared.cpp

@@ -2301,18 +2301,17 @@ void CBaseCombatWeapon::PrimaryAttack( void )
 
 	// To make the firing framerate independent, we may have to fire more than one bullet here on low-framerate systems, 
 	// especially if the weapon we're firing has a really fast rate of fire.
-	info.m_iShots = 0;
 	float fireRate = GetFireRate();
 	int32 fireTimes = fireRate > 0.0f ? truncf((gpGlobals->curtime - m_flNextPrimaryAttack) / fireRate) + 1 : 1;
 
-	for (int32 times = 0; times < fireTimes; ++times)
+	for (info.m_iShots = 0; info.m_iShots < fireTimes; ++info.m_iShots)
 	{
 		// MUST call sound before removing a round from the clip of a CMachineGun
 		WeaponSound(SINGLE, m_flNextPrimaryAttack);
-		m_flNextPrimaryAttack = m_flNextPrimaryAttack + fireRate;
-		info.m_iShots++;
 	}
 
+	m_flNextPrimaryAttack += info.m_iShots * fireRate;
+
 	// Make sure we don't fire more than the amount in the clip
 	if ( UsesClipsForAmmo1() )
 	{

game/shared/tf/tf_gamerules.cpp

@@ -20805,6 +20805,8 @@ void CTFGameRules::MatchSummaryEnd( void )
 	tf_bot_quota_mode.SetValue( tf_bot_quota_mode.GetDefault() );
 }
 
+ConVar tf_sv_mvm_forced_players("tf_sv_mvm_forced_players", "0", FCVAR_REPLICATED);
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
@@ -20848,7 +20850,12 @@ int CTFGameRules::GetTeamAssignmentOverride( CTFPlayer *pTFPlayer, int iDesiredT
 			}
 
 			// Bootcamp mode can mix a lobby with ad-hoc joins
-			int nSlotsLeft = kMVM_DefendersTeamSize - nMatchPlayers - nAdHocDefenders;
+			int iTeamSize = kMVM_DefendersTeamSize;
+			if (tf_sv_mvm_forced_players.GetInt() > iTeamSize)
+			{
+				iTeamSize = tf_sv_mvm_forced_players.GetInt();
+			}
+			int nSlotsLeft = iTeamSize - nMatchPlayers - nAdHocDefenders;
 			if ( nSlotsLeft >= 1 )
 			{
 				Log( "MVM assigned %s to defending team (%d more slots remaining after us)\n", pTFPlayer->GetPlayerName(), nSlotsLeft-1 );