[avida-cvs] avida CVS commits: /current/source/main reaction_result.cc reaction_result.hh

[bdbaer]

bdbaer		Tue Jul 15 09:42:19 2003 EDT

  Modified files:              
    /avida/current/source/main	reaction_result.cc reaction_result.hh 
  Log:
  Corrected minor logical errors.
  
  
Index: avida/current/source/main/reaction_result.cc
diff -u avida/current/source/main/reaction_result.cc:1.3 avida/current/source/main/reaction_result.cc:1.4
--- avida/current/source/main/reaction_result.cc:1.3	Tue Jun 24 14:56:39 2003
+++ avida/current/source/main/reaction_result.cc	Tue Jul 15 09:42:18 2003
@@ -18,8 +18,8 @@
   , reactions_triggered(num_reactions)
   , bonus_add(0.0)
   , bonus_mult(1.0)
-  , active_reaction(false)
   , lethal(false)
+  , active_reaction(false)
 {
 }
 
@@ -76,10 +76,10 @@
   resources_detected[id] += num;
 }
 
-void cReactionResult::Lethal(bool num)
+void cReactionResult::Lethal(bool flag)
 {
  ActivateReaction();
- lethal = true;
+ lethal = flag;
 }
 
 void cReactionResult::MarkTask(int id)
Index: avida/current/source/main/reaction_result.hh
diff -u avida/current/source/main/reaction_result.hh:1.2 avida/current/source/main/reaction_result.hh:1.3
--- avida/current/source/main/reaction_result.hh:1.2	Tue Jun 24 14:56:39 2003
+++ avida/current/source/main/reaction_result.hh	Tue Jul 15 09:42:18 2003
@@ -20,10 +20,7 @@
   double bonus_add;
   double bonus_mult;
   bool lethal;
-  
-
   bool active_reaction;
-
   inline void ActivateReaction();
 public:
   cReactionResult(const int num_resources, const int num_tasks,