[Avida-SVN] r3354 - branches/mabinmer/source/main

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2009-07-21 13:44:53 -0400 (Tue, 21 Jul 2009)
New Revision: 3354

Modified:
   branches/mabinmer/source/main/cTaskLib.cc
Log:
fixed task which checks whether any kazi instruction has been executed 
-This line, and those below, will be ignored--

M    source/main/cTaskLib.cc


Modified: branches/mabinmer/source/main/cTaskLib.cc
===================================================================
--- branches/mabinmer/source/main/cTaskLib.cc	2009-07-16 15:49:00 UTC (rev 3353)
+++ branches/mabinmer/source/main/cTaskLib.cc	2009-07-21 17:44:53 UTC (rev 3354)
@@ -3400,12 +3400,8 @@
   {
     if (strncmp(instSet.GetName(i), "kazi", 4) == 0)
 	{
-	  id = i;
+	  if (instCounts[i]>0) return 1;
 	}
   }
-  // This should cause an error because the instruction isn't even in the instruction set
-  if (id == -1) return 0;
-  
-  if (instCounts[id] > 0) return 1;
-  else return 0;
-}
\ No newline at end of file
+  return 0;
+}