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

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

Browse Source
This commit is contained in:
jancoow
2016-06-21 17:01:08 +02:00
parent 4249e35653 ec900f7410
commit 02a537dc60
6 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
World.cpp
+9 -1
View File
@@ -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())