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

Merge branch 'developer' into musicInclude

Browse Source 
# Conflicts:
#	worlds/small.json
This commit is contained in:
Aaldert
2016-06-21 19:16:12 +02:00
parent b09311d810 d42ae6ccd3
commit 579a04a9b4
18 changed files with 796 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
World.cpp
+10 -2
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"])
@@ -126,12 +126,20 @@ World::World(const std::string &fileName)
if (e["music"].isNull())
std::cout << "Invalid world file: enemies music - " << fileName << "\n";
//Damage
if (e["damage"].isNull())
std::cout << "Invalid world file: enemies damage - " << fileName << "\n";
//Health
if (e["health"].isNull())
std::cout << "Invalid world file: enemies health - " << fileName << "\n";
//Create
Vec3f position(e["pos"][0].asFloat(), e["pos"][1].asFloat(), e["pos"][2].asFloat());
position.y = getHeight(position.x, position.z) + 2.0f;
maxEnemies++;
enemies.push_back(new Enemy(e["file"].asString(), e["music"].asString(), position, rotation, scale));
enemies.push_back(new Enemy(e["file"].asString(), e["music"].asString(), e["damage"].asFloat(), e["health"].asFloat(), position, rotation, scale));
}
maxCrystals = 0;
if (!v["crystal"].isNull())