[nexuiz-commits] r8310 - trunk/misc/tools

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-11-22 07:31:25 -0500 (Sun, 22 Nov 2009)
New Revision: 8310

Modified:
   trunk/misc/tools/midi2cfg-ng-percussionpack.conf
   trunk/misc/tools/midi2cfg-ng.pl
Log:
bugfix for tuba orchestra :P


Modified: trunk/misc/tools/midi2cfg-ng-percussionpack.conf
===================================================================
--- trunk/misc/tools/midi2cfg-ng-percussionpack.conf	2009-11-22 12:06:54 UTC (rev 8309)
+++ trunk/misc/tools/midi2cfg-ng-percussionpack.conf	2009-11-22 12:31:25 UTC (rev 8310)
@@ -620,10 +620,10 @@
 
 bot tuba_movetoplace
 	init
-		cmd movetotarget @places_tuba
+		# cmd movetotarget @places_tuba
 		cmd barrier
 	done
-		cmd movetotarget @places_end
+		# cmd movetotarget @places_end
 		cmd resetaim
 		cmd aim "90 0"
 		cmd wait 1
@@ -638,10 +638,10 @@
 
 bot percussion_movetoplace
 	init
-		cmd movetotarget @places_percussion
+		# cmd movetotarget @places_percussion
 		cmd barrier
 	done
-		cmd movetotarget @places_end
+		# cmd movetotarget @places_end
 		cmd resetaim
 		cmd aim "90 0"
 		cmd wait 1
@@ -657,12 +657,12 @@
 bot instance_tuba_red
 	include tuba_movetoplace
 	include tuba_red
-	count 16
+	count 32
 
 bot instance_tuba_blue
 	include tuba_movetoplace
 	include tuba_blue
-	count 16
+	count 32
 
 bot instance_rocket
 	include percussion_movetoplace

Modified: trunk/misc/tools/midi2cfg-ng.pl
===================================================================
--- trunk/misc/tools/midi2cfg-ng.pl	2009-11-22 12:06:54 UTC (rev 8309)
+++ trunk/misc/tools/midi2cfg-ng.pl	2009-11-22 12:31:25 UTC (rev 8310)
@@ -285,9 +285,6 @@
 	my ($bot, $time, $channel, $note, $init) = @_;
 	return -1 # I won't play on this channel
 		if defined $bot->{channels} and not $bot->{channels}->{$channel};
-	return 0
-		if $bot->{busy};
-	#print STDERR "note on $bot:$time:$channel:$note\n";
 	my $cmds;
 	my $cmds_off;
 	if($channel == 10)
@@ -302,6 +299,9 @@
 	}
 	return -1 # I won't play this note
 		if not defined $cmds;
+	return 0
+		if $bot->{busy};
+	#print STDERR "note on $bot:$time:$channel:$note\n";
 	if($init)
 	{
 		return 0
@@ -402,7 +402,7 @@
 			push @busybots_allocated, $bot;
 			return 1;
 		}
-		$overflow = 1
+		die "Fresh bot cannot play stuff"
 			if $canplay == 0;
 	}