diff options
Diffstat (limited to '')
| -rw-r--r-- | src/koopatlas/mapdata.cpp | 3 | ||||
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 1 | ||||
| -rw-r--r-- | src/koopatlas/shop.cpp | 26 | ||||
| -rw-r--r-- | src/koopatlas/starcoin.cpp | 1 |
4 files changed, 16 insertions, 15 deletions
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp index 769c6c8..cae2819 100644 --- a/src/koopatlas/mapdata.cpp +++ b/src/koopatlas/mapdata.cpp @@ -245,8 +245,9 @@ void dKPMapData_c::fixup() { fixRef(node->tileLayer); fixRef(node->doodadLayer); - if (node->type == dKPNode_s::CHANGE) + if (node->type == dKPNode_s::CHANGE) { fixRef(node->destMap); + OSReport("Node: %x, %s"), node->destMap, node->destMap; } } break; diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index 090a82e..a175763 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -504,6 +504,7 @@ void dWMPathManager_c::moveThroughPath() { isMoving = false; SaveBlock *save = GetSaveFile()->GetBlock(-1); + OSReport("node: %x, %s", to->destMap, to->destMap); save->current_world = dScKoopatlas_c::instance->getIndexForMapName(to->destMap); OSReport("Change to map ID %d (%s), entrance ID %d\n", save->current_world, to->destMap, to->foreignID); diff --git a/src/koopatlas/shop.cpp b/src/koopatlas/shop.cpp index cd30bfa..eed0222 100644 --- a/src/koopatlas/shop.cpp +++ b/src/koopatlas/shop.cpp @@ -243,19 +243,19 @@ int dWMShop_c::onDraw() { void dWMShop_c::specialDraw1() { if (!isHidden) { - Vec pos = {250.0f, 170.0f, -1000.0f}; - S16Vec rot = {0,0,0}; - Vec scale = {1.0f, 1.0f, 1.0f}; - matrix.translation(pos.x, pos.y, pos.z); - matrix.applyRotationYXZ(&rot.x, &rot.y, &rot.z); - - shopkeep.setDrawMatrix(matrix); - shopkeep.setScale(&scale); - shopkeep.calcWorld(false); - shopkeep.scheduleForDrawing(); - - if(this->ska.isAnimationDone()) - this->ska.setCurrentFrame(0.0); + // Vec pos = {250.0f, 170.0f, -1000.0f}; + // S16Vec rot = {0,0,0}; + // Vec scale = {1.0f, 1.0f, 1.0f}; + // matrix.translation(pos.x, pos.y, pos.z); + // matrix.applyRotationYXZ(&rot.x, &rot.y, &rot.z); + + // shopkeep.setDrawMatrix(matrix); + // shopkeep.setScale(&scale); + // shopkeep.calcWorld(false); + // shopkeep.scheduleForDrawing(); + + // if(this->ska.isAnimationDone()) + // this->ska.setCurrentFrame(0.0); } return; } diff --git a/src/koopatlas/starcoin.cpp b/src/koopatlas/starcoin.cpp index 667be09..618144e 100644 --- a/src/koopatlas/starcoin.cpp +++ b/src/koopatlas/starcoin.cpp @@ -48,7 +48,6 @@ int dWMStarCoin::onCreate() { if (!gotFile) return false; - isHidden = false; static const char *brlanNames[2] = {"coin_inWindow.brlan", "coin_outWindow.brlan"}; static const char *groupNames[2] = {"A00_Window", "A00_Window"}; |