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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-09 03:35:04 -0400 (Tue, 09 Jun 2009)
New Revision: 6937

Modified:
   trunk/misc/tools/midi2cfg.pl
Log:
fix bot allocation. fugue c minor now is 9 bots.


Modified: trunk/misc/tools/midi2cfg.pl
===================================================================
--- trunk/misc/tools/midi2cfg.pl	2009-06-09 07:33:56 UTC (rev 6936)
+++ trunk/misc/tools/midi2cfg.pl	2009-06-09 07:35:04 UTC (rev 6937)
@@ -101,7 +101,7 @@
 			return $bot;
 		}
 		return $l->[$_] if
-			$l->[$_]{channel} == $vchannel
+			(($vchannel < 16) || ($l->[$_]{channel} == $vchannel))
 			&&
 			!$l->[$_]{busy}
 			&&
@@ -148,7 +148,7 @@
 	my $b0 = $bot->{curbuttons};
 	my $press = $b & ~$b0;
 	my $release = $b0 & ~$b;
-	busybot_advance $bot => $t - 0.1
+	busybot_advance $bot => $t - 0.10
 		if $release & (32 | 64);
 	print "r $bot->{id} attack1\n" if $release & 32;
 	print "r $bot->{id} attack2\n" if $release & 64;
@@ -281,8 +281,11 @@
 			$bot->{busy} = 1;
 			$bot->{note} = $note;
 			$bot->{busytime} = $t + 0.25;
-			busybot_stopnoteandadvance $bot => $t + 0.15, $note
-				if $staccato;
+			if($staccato)
+			{
+				busybot_stopnoteandadvance $bot => $t + 0.15, $note;
+				$bot->{busy} = 0;
+			}
 		}
 	}
 	if($channel >= 16)