From: Samual <samual@xonotic.org>
Date: Mon, 14 Mar 2011 22:02:06 +0000 (-0400)
Subject: Fix the sniper rifle ammo and also fix the issue of bots with reading undeclared... 
X-Git-Tag: xonotic-v0.5.0~309^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b55ae52c729d03e7e22b3f57e94e2218c9eb2f22;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the sniper rifle ammo and also fix the issue of bots with reading undeclared cvars
---

diff --git a/balance25.cfg b/balance25.cfg
index 22ec04d1c..665dda5c9 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index d0a348418..77aac858a 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 75ead55dc..0183a3b5b 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 3dee36e8e..a782c6387 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
diff --git a/balancetZork.cfg b/balancetZork.cfg
index 0c5436b24..2fb726764 100644
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -670,7 +670,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 34db488b1..e67bc214e 100644
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -165,7 +165,7 @@ void havocbot_ai()
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			{
 				e = get_weaponinfo(i);
-				if(self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
+				if ((e.spawnflags & WEP_FLAG_RELOADABLE) && (self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo"))))
 					self.switchweapon = i;
 			}
 		}