Fix cl_spawnweapon_ cvars when set to the last weapon slot

- Fixes #222
fortressforever · Jun 5, 2016 · 9a11e47 · 9a11e47
1 parent b42d0bd
commit 9a11e47
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dlls/ff/ff_player.cpp b/dlls/ff/ff_player.cpp
@@ -1585,7 +1585,7 @@ void CFFPlayer::Spawn( void )
 		CBaseCombatWeapon *pSpawnWeapon = Weapon_OwnsThisType(weaponSpawn);
 		if(pSpawnWpn && pSpawnWeapon)
 		{
-			if(Weapon_Switch(pSpawnWeapon))
+			if(pSpawnWeapon == GetActiveWeapon() || Weapon_Switch(pSpawnWeapon))
 				break;
 		}