diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-07-18 21:50:37 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-07-18 21:50:37 -0500 |
| commit | 5f03da589c0d0eb22e73993198a709ddb95f2960 (patch) | |
| tree | a05216246df9bd7fdd323bb1473efb5b415d238c /src/koopatlas/map.cpp | |
| parent | 8f1b1aa7eb7f8700e1979b5c4d1d4e96d274119b (diff) | |
| download | kamek-5f03da589c0d0eb22e73993198a709ddb95f2960.tar.gz kamek-5f03da589c0d0eb22e73993198a709ddb95f2960.zip | |
Putting the build into working order.
Diffstat (limited to 'src/koopatlas/map.cpp')
| -rw-r--r-- | src/koopatlas/map.cpp | 12 |
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); |