From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 14 Oct 2011 21:34:40 +0000 (+0200)
Subject: bugfixes and midi2cfg changes from my secret branch
X-Git-Tag: xonotic-v0.6.0~69^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=075250227575af7127abb3f885a6b0bf60b51d8f;p=xonotic%2Fxonotic.git

bugfixes and midi2cfg changes from my secret branch
---

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index f136663b..b3fe3d41 100644
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -866,7 +866,7 @@ bot common
 bot instance_tuba_red
 	include tuba_red
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
@@ -875,7 +875,7 @@ bot instance_tuba_red
 bot instance_tuba_blue
 	include tuba_blue
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
@@ -884,7 +884,7 @@ bot instance_tuba_blue
 bot instance_accordeon_red
 	include accordeon_red
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
@@ -893,7 +893,7 @@ bot instance_accordeon_red
 bot instance_accordeon_blue
 	include accordeon_blue
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
diff --git a/misc/tools/midi2cfg-ng.pl b/misc/tools/midi2cfg-ng.pl
index 4fe6a0ce..ad06b746 100755
--- a/misc/tools/midi2cfg-ng.pl
+++ b/misc/tools/midi2cfg-ng.pl
@@ -857,7 +857,7 @@ sub ConvertMIDI($$)
 					my $votehigh = 0;
 					my $votelow = 0;
 					my $votegood = 0;
-					for(@busybots_allocated)
+					for(@busybots_allocated, grep { $_->{count} > 0 } values %$busybots)
 					{
 						next # I won't play on this channel
 							if defined $_->{channels} and not $_->{channels}->{$channel};