[Avida-SVN] r1892 - branches/uml/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-06 10:27:34 -0400 (Mon, 06 Aug 2007)
New Revision: 1892

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-06 14:10:06 UTC (rev 1891)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-06 14:27:34 UTC (rev 1892)
@@ -3526,8 +3526,8 @@
 		(organism->getUMLModel()->getBonusInfo("spinw2") == 0)) { 
 			return bonus;
 	} */
-	if ((organism->getUMLModel()->getBonusInfo("scenario5") != 6) || 
-		(organism->getUMLModel()->getBonusInfo("scenario6") != 4)) { 
+	if ((organism->getUMLModel()->getBonusInfo("scenario5") != 0) || 
+		(organism->getUMLModel()->getBonusInfo("scenario6") != 0)) { 
 			return bonus;
 	}
 	
@@ -3540,6 +3540,7 @@
 		bonus /= mt;
 	}	
 	
+	// cap the amount of bonus.
 	if (bonus > 5) bonus = 5;
 	
 	return bonus;