From b89acd21a542e8b9023a5f987ee3313e9eaef19b Mon Sep 17 00:00:00 2001 From: Treeki Date: Mon, 13 May 2013 16:11:21 +0200 Subject: fix the 8-Tower1 death bug --- src/koopatlas/core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 6618650..3e325b5 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -408,7 +408,7 @@ int dScKoopatlas_c::onCreate() { save->current_world = 6; } - if (MaybeFinishingLevel[0] == 7 && MaybeFinishingLevel[1] == 24) { + if (MaybeFinishingLevel[0] == 7 && MaybeFinishingLevel[1] == 24 && save->CheckLevelCondition(7, 24, COND_NORMAL)) { currentMapID = 7; // KoopaPlanetUnd save->current_world = 7; isAfter8Castle = true; -- cgit v1.2.3 From 55b1b23dde3d201375da97ed009968bbf5443586 Mon Sep 17 00:00:00 2001 From: Treeki Date: Mon, 13 May 2013 16:16:42 +0200 Subject: butts, canopies, butt canopies, and canopy butts --- src/makeYourOwnModelSprite.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/makeYourOwnModelSprite.cpp b/src/makeYourOwnModelSprite.cpp index 82718c7..6206009 100644 --- a/src/makeYourOwnModelSprite.cpp +++ b/src/makeYourOwnModelSprite.cpp @@ -558,6 +558,16 @@ int dMakeYourOwn::onCreate() { setupAnim("anim", 1.0); break; + + case 49: // Chestnut Canopy + + setupModel("chestnut", "g3d/canopy_3.brres", "canopy_3"); + SetupTextures_MapObj(&bodyModel, 0); + this->pos.z = 0.0; + + // setupAnim("anim38", 1.0); + break; + } allocator.unlink(); -- cgit v1.2.3