[Avida-SVN] r3132 - development/source/main

[connel42 at myxo.css.msu.edu]

Author: connel42
Date: 2009-01-22 10:16:06 -0500 (Thu, 22 Jan 2009)
New Revision: 3132

Modified:
   development/source/main/cPhenotype.cc
Log:
Fixed small bug in energy sharing buffer

Modified: development/source/main/cPhenotype.cc
===================================================================
--- development/source/main/cPhenotype.cc	2009-01-21 21:07:04 UTC (rev 3131)
+++ development/source/main/cPhenotype.cc	2009-01-22 15:16:06 UTC (rev 3132)
@@ -1381,14 +1381,15 @@
 
 void cPhenotype::ApplyDonatedEnergy() {
   double energy_cap = m_world->GetConfig().ENERGY_CAP.Get();
-  
+
   if((energy_store + energy_received_buffer) >= energy_cap) {
     IncreaseEnergyApplied(energy_cap - energy_store);
+    SetEnergy(energy_store + (energy_cap - energy_received_buffer));
   } else {
     IncreaseEnergyApplied(energy_received_buffer);
+    SetEnergy(energy_store + energy_received_buffer);
   }
   
-  SetEnergy(energy_store + energy_received_buffer);
   energy_received_buffer = 0.0;
 } //End AppplyDonatedEnergy()