enemy collide logic in enemy and out of world

2016-06-03 13:51:54 +02:00
parent 527394f635
commit b827885f40
3 changed files with 11 additions and 9 deletions
@@ -168,7 +168,7 @@ void World::update(float elapsedTime)
 		//Al deze code zou in enemy moeten staan
 		enemy->inEyeSight(player->position);

-		
+
 		enemy->update(elapsedTime);
 		if (enemy->hasTarget)
 		{
@@ -176,14 +176,11 @@ void World::update(float elapsedTime)
 			{
 				if (e->canCollide && e->inObject(enemy->position))
 				{
-					Vec3f difference = e->position - enemy->position; //zou misschien omgedraait moeten worden
-					difference.Normalize();
-					difference = difference * (e->model->radius + 0.01f);
-					enemy->position = e->position + difference;
+					enemy->collide(e);
 					break;
 				}
 			}
-		}		
+		}
 		//tot hier
 	}
 }