Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into feature/weaponCollision

Browse Source 
Added waeponswitch to backbutton of controller

# Conflicts:
#	Enemy.cpp
#	Player.cpp
#	Weapon.cpp
#	Weapon.h
This commit is contained in:
jancoow
2016-06-21 23:10:58 +02:00
parent e7163fc07c 3cf6bf5857
commit ba0482ee0a
26 changed files with 782 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
World.cpp
+2 -1
View File
@@ -64,8 +64,8 @@ World::World(const std::string &fileName)
//Set player starting position
player->position.x = v["player"]["startposition"][0].asFloat();
player->position.y = v["player"]["startposition"][1].asFloat();
player->position.z = v["player"]["startposition"][2].asFloat();
player->position.y = heightmap->GetHeight(player->position.x, player->position.z);
//Load and place objects into world
for (auto object : v["objects"])
@@ -329,6 +329,7 @@ void World::update(float elapsedTime)
if (remove)
{
delete enemies[count];
player->XpUp(enemies[count]->xp);
enemies.erase(enemies.begin() + count);
player->HpUp(10);