From: terencehill <piuntn@gmail.com>
Date: Sat, 22 Aug 2015 21:58:39 +0000 (+0200)
Subject: Something else was wrong :/
X-Git-Tag: xonotic-v0.8.2~1891^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a0a311ff868e71c2336e0cdffdadad6a55fac8f;p=xonotic%2Fxonotic-data.pk3dir.git

Something else was wrong :/
---

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index ee7b54934..08b821aba 100644
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -914,24 +914,21 @@ void havocbot_chooseenemy()
 	while(true)
 	{
 		scan_secondary_targets = false;
-		while(head)
+		:scan_targets
+		for( ; head; head = head.chain)
 		{
 			if(!scan_secondary_targets)
 			{
 				if(head.classname == "misc_breakablemodel")
 				{
 					have_secondary_targets = true;
-					head = head.chain;
 					continue;
 				}
 			}
 			else
 			{
 				if(head.classname != "misc_breakablemodel")
-				{
-					head = head.chain;
 					continue;
-				}
 			}
 
 			v = (head.absmin + head.absmax) * 0.5;
@@ -947,16 +944,15 @@ void havocbot_chooseenemy()
 					bestrating = rating;
 				}
 			}
+		}
 
-			if(!best && have_secondary_targets && !scan_secondary_targets)
-			{
-				scan_secondary_targets = true;
-				// restart the loop
-				head = head2;
-				bestrating = 100000000;
-			}
-			else
-				head = head.chain;
+		if(!best && have_secondary_targets && !scan_secondary_targets)
+		{
+			scan_secondary_targets = true;
+			// restart the loop
+			head = head2;
+			bestrating = 100000000;
+			goto scan_targets;
 		}
 
 		// I want to do a second scan if no enemy was found or I don't have weapons