From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 12 Feb 2011 00:32:35 +0000 (+0200)
Subject: No need to check self.weapon here
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f74ae7d5e27da903161ac2333b5587fd6c985a76;p=xonotic%2Fxonotic-data.pk3dir.git

No need to check self.weapon here
---

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 947a75af8..c06bf9c2d 100644
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -153,15 +153,15 @@ void havocbot_ai()
 		entity e;
 
 		// we are currently holding a weapon that's not fully loaded, reload it
-		if(skill >= 2) // bots can only reload held weapons on purpose past this skill
-		if(self.clip_load < self.clip_size && self.weapon)
+		if(skill >= 2) // bots can only reload the held weapon on purpose past this skill
+		if(self.clip_load < self.clip_size)
 			self.impulse = 20; // "press" the reload button, not sure if this is done right
 
 		// if we're not reloading a weapon, switch to any weapon in our invnetory that's not fully loaded to reload it next
 		// the code above executes next frame, starting the reloading then
 		if(skill >= 5) // bots can only look for unloaded weapons past this skill
 		if(self.clip_load >= 0) // only if we're not reloading a weapon already
-		if not(self.clip_load < self.clip_size && self.weapon) // we're already holding a weapon we can reload, don't look for another
+		if not(self.clip_load < self.clip_size) // we're already holding a weapon we can reload, don't look for another
 		{
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			{