Merge branch 'developer' into musicInclude

# Conflicts: # Enemy.cpp # World.cpp
2016-06-21 19:06:50 +02:00
parent 41a81d104e 0a0fdfc8b1
commit b09311d810
32 changed files with 4771 additions and 50 deletions
@@ -240,7 +240,7 @@ float World::getHeight(float x, float y)

 void World::draw()
 {
-	player->setCamera();
+

 	float lightPosition[4] = { 0, 2, 1, 0 };
 	glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
@@ -252,6 +252,9 @@ void World::draw()

 	skybox->draw();

+	player->setCamera();
+	player->draw();
+
 	heightmap->Draw();

 	for (auto &enemy : enemies)
@@ -317,10 +320,11 @@ void World::update(float elapsedTime)
 	if (remove)
 	{
 		delete enemies[count];
+		player->XpUp(enemies[count]->xp);
 		enemies.erase(enemies.begin() + count);
+		player->HpUp(10);		
 	}

-
 	skybox->update(elapsedTime, maxEnemies - enemies.size(), maxEnemies);

 	if (portal->mayEnter)