enemy hits player

2016-06-22 00:26:43 +02:00
parent 50e2b1c7ea
commit fea7728139
4 changed files with 29 additions and 13 deletions
@@ -313,7 +313,7 @@ void World::update(float elapsedTime)

 		//Al deze code zou in enemy moeten staan
 		enemy->inEyeSight(player->position);
-
+		

 		enemy->update(elapsedTime);
 		if (enemy->hasTarget)
@@ -326,12 +326,11 @@ void World::update(float elapsedTime)
 					break;
 				}
 			}
+		}

-			if (enemy->attack)
-			{
-				remove = true;
-				continue;
-			}
+		if (enemy->attack())
+		{			
+			player->HpDown(enemy->damage);
 		}
 		enemy->position.y = getHeight(enemy->position.x, enemy->position.z) + 2.0f;
 		
@@ -342,7 +341,8 @@ void World::update(float elapsedTime)
 	if (remove)
 	{
 		player->XpUp(enemies[count]->xp);
-		delete enemies[count];		
+		delete enemies[count];
+		
 		enemies.erase(enemies.begin() + count);
 		player->HpUp(10);		
 	}