OpenKore

Revision: 4070
Author:   arachnophobia
Date:     2006-03-05 15:11:21 -0800 (Sun, 05 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/openkore/?rev=4070&view=rev

Log Message:
-----------
fixed "pause"

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm
Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-03-05 20:52:02 UTC (rev 4069)
+++ macro/trunk/Macro/Script.pm	2006-03-05 23:11:21 UTC (rev 4070)
@@ -364,7 +364,6 @@
     my ($tmp) = $line =~ /^pause\s+(\d+)/;
     if (defined $tmp) {$self->{timeout} = $tmp}
     $self->{line}++;
-    $self->{timeout} = $self->{macro_delay}
   ##########################################
   # stop command
   } elsif ($line =~ /^stop$/) {



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4620
Author:   arachnophobia
Date:     2006-06-13 06:57:27 -0700 (Tue, 13 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/openkore/?rev=4620&view=rev

Log Message:
-----------
fixed "set macro_delay" for non-integer values

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm
Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-06-12 11:37:33 UTC (rev 4619)
+++ macro/trunk/Macro/Script.pm	2006-06-13 13:57:27 UTC (rev 4620)
@@ -398,7 +398,7 @@
     my ($var, $val) = $line =~ /^set\s+([\w]+)\s+(.*)$/;
     if ($var eq 'macro_delay' && $val =~ /^\d+$/) {
       $self->{macro_delay} = $val
-    } elsif ($var eq 'repeat' && $val =~ /^\d+$/) {
+    } elsif ($var eq 'repeat' && $val =~ /^[\d\.]\d+$/) {
       $self->{repeat} = $val
     } elsif ($var eq 'overrideAI' && $val =~ /^[01]$/) {
       $self->{overrideAI} = $val


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4621
Author:   arachnophobia
Date:     2006-06-14 04:42:30 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/openkore/?rev=4621&view=rev

Log Message:
-----------
fixed "set macro_delay .." again (wrong line); fixed "set"

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm
Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-06-13 13:57:27 UTC (rev 4620)
+++ macro/trunk/Macro/Script.pm	2006-06-14 11:42:30 UTC (rev 4621)
@@ -396,9 +396,9 @@
   # set command
   } elsif ($line =~ /^set\s+/) {
     my ($var, $val) = $line =~ /^set\s+([\w]+)\s+(.*)$/;
-    if ($var eq 'macro_delay' && $val =~ /^\d+$/) {
+    if ($var eq 'macro_delay' && $val =~ /^[\d\.]*\d+$/) {
       $self->{macro_delay} = $val
-    } elsif ($var eq 'repeat' && $val =~ /^[\d\.]\d+$/) {
+    } elsif ($var eq 'repeat' && $val =~ /^\d+$/) {
       $self->{repeat} = $val
     } elsif ($var eq 'overrideAI' && $val =~ /^[01]$/) {
       $self->{overrideAI} = $val
@@ -409,6 +409,7 @@
     } else {
       $self->{error} = "$errtpl: unrecognized key or wrong value"
     }
+    $self->{line}++;
     $self->{timeout} = 0
   ##########################################
   # unrecognized line


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4755
Author:   arachnophobia
Date:     2006-07-20 08:58:55 -0700 (Thu, 20 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/openkore/?rev=4755&view=rev

Log Message:
-----------
meep

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm
Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-07-20 15:02:35 UTC (rev 4754)
+++ macro/trunk/Macro/Script.pm	2006-07-20 15:58:55 UTC (rev 4755)
@@ -48,7 +48,6 @@
 # destructor
 sub DESTROY {
   my $self = shift;
-#  message "[macro] deregistering macro from queue\n";
   AI::dequeue() if (AI::is('macro') && !$self->{submacro})
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4878
          http://svn.sourceforge.net/openkore/?rev=4878&view=rev
Author:   arachnophobia
Date:     2006-08-31 04:56:14 -0700 (Thu, 31 Aug 2006)

Log Message:
-----------
added missing zero

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm

Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-08-31 09:25:50 UTC (rev 4877)
+++ macro/trunk/Macro/Script.pm	2006-08-31 11:56:14 UTC (rev 4878)
@@ -40,7 +40,7 @@
 		error => undef,
 		orphan => $::config{macro_orphans},
 		interruptible => 1,
-		macro_block =>
+		macro_block => 0
 	};
 	bless ($self, $class);
 	return $self


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4896
          http://svn.sourceforge.net/openkore/?rev=4896&view=rev
Author:   arachnophobia
Date:     2006-09-06 06:32:11 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
fix dequeueing from ai queue

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm

Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-09-05 20:13:08 UTC (rev 4895)
+++ macro/trunk/Macro/Script.pm	2006-09-06 13:32:11 UTC (rev 4896)
@@ -49,7 +49,7 @@
 # destructor
 sub DESTROY {
 	my $self = shift;
-	AI::dequeue() if (AI::is('macro') && !$self->{submacro})
+	AI::clear('macro') if (AI::inQueue('macro') && !$self->{submacro})
 }
 
 # declares current macro to be a submacro


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4951
          http://svn.sourceforge.net/openkore/?rev=4951&view=rev
Author:   arachnophobia
Date:     2006-09-23 05:20:41 -0700 (Sat, 23 Sep 2006)

Log Message:
-----------
no need to copy arrays, save memory.

Modified Paths:
--------------
    macro/trunk/Macro/Script.pm

Modified: macro/trunk/Macro/Script.pm
===================================================================
--- macro/trunk/Macro/Script.pm	2006-09-23 12:02:18 UTC (rev 4950)
+++ macro/trunk/Macro/Script.pm	2006-09-23 12:20:41 UTC (rev 4951)
@@ -27,7 +27,6 @@
 		name => $name,
 		registered => 0,
 		submacro => 0,
-		script => [@{$macro{$name}}],
 		macro_delay => $timeout{macro_delay}{timeout},
 		timeout => 0,
 		time => time,
@@ -188,7 +187,7 @@
 		return
 	}
 
-	my $line = ${$self->{script}}[$self->{line}];
+	my $line = ${$macro{$self->{name}}}[$self->{line}];
 	if (!defined $line) {
 		if ($self->{repeat} > 1) {
 			$self->{repeat}--;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.