summaryrefslogtreecommitdiff
path: root/src/koopatlas/map.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/koopatlas/map.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp
index 38610e6..bca294c 100644
--- a/src/koopatlas/map.cpp
+++ b/src/koopatlas/map.cpp
@@ -312,7 +312,7 @@ void dWMMap_c::renderer_c::renderDoodadLayer(dKPLayer_s *layer) {
elapsed = anim->frameCount - 1 - elapsed;
if (elapsed >= anim->frameCount) {
- if (elapsed >= (anim->frameCount + delay)) {
+ if (elapsed >= (anim->frameCount + anim->delay)) {
// we've reached the end
switch (anim->loop) {
@@ -419,8 +419,10 @@ void dWMMap_c::renderer_c::renderDoodadLayer(dKPLayer_s *layer) {
}
void dWMMap_c::renderer_c::renderPathLayer(dKPLayer_s *layer) {
+ return;
+
for (int i = 0; i < layer->nodeCount; i++) {
- dKPNode_s **node = layer->nodes[i];
+ dKPNode_s *node = layer->nodes[i];
int world = node->levelNumber[0];
int level = node->levelNumber[1];
@@ -455,9 +457,9 @@ void dWMMap_c::renderer_c::renderPathLayer(dKPLayer_s *layer) {
else
node->color.setCurrentFrame(3); // Red
- matrix.translation(node->x, node->y, 500.0); }
- matrix.applyRotationYXZ(&rot.x, &rot.y, &rot.z);
- node->model.setDrawMatrix(matrix);
+ node->matrix.translation(node->x, node->y, 500.0);
+ node->matrix.applyRotationYXZ(0, 0, 0);
+ node->model.setDrawMatrix(node->matrix);
node->model.setScale(1.0f, 1.0f, 1.0f);
node->model.calcWorld(false);