Fire en Earth werkend

This commit is contained in:
Dofensmirtsz
2016-06-22 02:52:35 +02:00
parent 316d6c9e14
commit f6d7695405
11 changed files with 228 additions and 5 deletions
+3 -3
View File
@@ -219,7 +219,7 @@ World::World(const std::string &fileName)
if (!v["portal"]["pos"].isNull())
pos = Vec3f(v["portal"]["pos"][0].asFloat(),
v["portal"]["pos"][1].asFloat(),
v["portal"]["pos"][0].asFloat());
v["portal"]["pos"][2].asFloat());
pos.y = getHeight(pos.x, pos.z);
@@ -227,7 +227,7 @@ World::World(const std::string &fileName)
if (!v["portal"]["rot"].isNull())
pos = Vec3f(v["portal"]["rot"][0].asFloat(),
v["portal"]["rot"][1].asFloat(),
v["portal"]["rot"][0].asFloat());
v["portal"]["rot"][2].asFloat());
float scale = 1.0f;
if (!v["portal"]["scale"].isNull())
@@ -339,7 +339,7 @@ void World::update(float elapsedTime)
remove = true;
continue;
}
enemy->position.y = getHeight(enemy->position.x, enemy->position.z) + 2.0f;
enemy->position.y = getHeight(enemy->position.x, enemy->position.z);
if(!remove)
count++;