-added DNA combining, currently it just takes the average of the mother and father

-there maybe a random segfault, further investigation is needed

1 files changed, 3 insertions, 2 deletions

diff --git a/src/creature.cpp b/src/creature.cpp
index 0b7a438..1cd0a52 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -107,7 +107,7 @@ void Creature::Action()
                 hasTarget = false; 
         } 
         else if( Distance(rect,target->getRect()) < mine.reach && target->getType() == CREATURE_TYPE && target->getGender() != gender ){
-            target->impregnate();
+            target->impregnate(mine);
             hasTarget = false;
         }
         else
@@ -157,10 +157,11 @@ void Creature::Move(SDL_Rect R)
 	}
 }
 
-void Creature::impregnate()
+void Creature::impregnate(Dna D)
 {
     if(!pregnate){
         pregnate = true;
         pregnancyTime = 0;
+        childs = mine.combine(D);
     }
 }