From 60bc5dcb19a983e8ae335ba89f860c59473303fb Mon Sep 17 00:00:00 2001
From: tom <tombarrett@siu.edu>
Date: Sun, 12 Feb 2017 08:42:55 -0600
Subject: -added DNA combining, currently it just takes the average of the
 mother and father -there maybe a random segfault, further investigation is
 needed

---
 src/creature.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/creature.cpp')

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);
     }
 }
-- 
cgit v1.2.3