sodinskjdgnasdgkasdg
This commit is contained in:
@@ -200,7 +200,7 @@ World::World(const std::string &fileName):
|
||||
v["portal"]["rot"][1].asFloat(),
|
||||
v["portal"]["rot"][0].asFloat());
|
||||
|
||||
float scale = 1.0f;
|
||||
float scale = 2.0f;
|
||||
if (!v["portal"]["scale"].isNull())
|
||||
scale = !v["portal"]["scale"].asFloat();
|
||||
|
||||
@@ -288,7 +288,7 @@ void World::update(float elapsedTime)
|
||||
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++;
|
||||
|
||||
+2
-2
@@ -72,12 +72,12 @@
|
||||
]
|
||||
},
|
||||
"player": {
|
||||
"startposition": [ 270, 5, 330 ]
|
||||
"startposition": [ 325, 5, 495 ]
|
||||
},
|
||||
"objects": [ ],
|
||||
"portal": {
|
||||
"file": "models/Teleporter/Teleporter.obj",
|
||||
"pos": [ 10, 5, 10 ]
|
||||
"pos": [ 394, 5, 482 ]
|
||||
},
|
||||
"enemies": [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user