diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-11-09 15:48:26 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-11-09 15:48:26 -0600 |
| commit | a7ed95b8c0e30aca3b6e713792449a77d4150501 (patch) | |
| tree | 1faefe9d04788cbaba522d39f0bf77a5854dd43f | |
| parent | 13d8853431dfe9066263e870dbdf4ef6980e34cd (diff) | |
| download | kamek-a7ed95b8c0e30aca3b6e713792449a77d4150501.tar.gz kamek-a7ed95b8c0e30aca3b6e713792449a77d4150501.zip | |
some pumpkin things
Diffstat (limited to '')
| -rw-r--r-- | src/effectvideo.cpp | 2 | ||||
| -rw-r--r-- | src/pumpkinGoomba.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/effectvideo.cpp b/src/effectvideo.cpp index 24089ef..d1495d8 100644 --- a/src/effectvideo.cpp +++ b/src/effectvideo.cpp @@ -88,6 +88,8 @@ int EffectVideo::onExecute() { case 526: efName = "Wm_ob_fireworks_k"; break; case 533: efName = "Wm_ob_fireworks_1up"; break; case 540: efName = "Wm_ob_fireworks_star"; break; + case 864: efName = "Wm_en_obakedoor_sm"; break; + case 865: efName = "Wm_en_obakedoor_ic"; break; } if (efName != 0) diff --git a/src/pumpkinGoomba.cpp b/src/pumpkinGoomba.cpp index 426d323..62f4e3f 100644 --- a/src/pumpkinGoomba.cpp +++ b/src/pumpkinGoomba.cpp @@ -74,7 +74,7 @@ dGoombaPie *dGoombaPie::build() { void pieCollisionCallback(ActivePhysics *one, ActivePhysics *two) { if (two->owner->name == EN_KURIBO) { return; } - if (two->owner->name == EN_KURIBO) { return; } + if (two->owner->name == EN_PATA_KURIBO) { return; } dEn_c::collisionCallback(one, two); } @@ -154,11 +154,11 @@ int dGoombaPie::onCreate() { this->resFile.data = getResource("pumpkin", "g3d/model.brres"); nw4r::g3d::ResMdl mdl = this->resFile.GetResMdl("Pumpkin"); bodyModel.setup(mdl, &allocator, 0x224, 1, 0); - SetupTextures_Map(&bodyModel, 0); + // SetupTextures_Map(&bodyModel, 0); mdl = this->resFile.GetResMdl("FX_Pumpkin"); burstModel.setup(mdl, &allocator, 0x224, 1, 0); - SetupTextures_Map(&burstModel, 0); + // SetupTextures_Map(&burstModel, 0); allocator.unlink(); @@ -178,7 +178,7 @@ int dGoombaPie::onCreate() { HitMeBaby.category1 = 0x3; HitMeBaby.category2 = 0x0; HitMeBaby.bitfield1 = 0x01; - HitMeBaby.bitfield2 = 0x80020; + HitMeBaby.bitfield2 = 0x820A0; HitMeBaby.unkShort1C = 0; HitMeBaby.callback = &pieCollisionCallback; @@ -187,7 +187,7 @@ int dGoombaPie::onCreate() { // Remember to follow a goomba - if (settings == 0) { + if ((settings & 0xF) == 0) { Goomber = (dStageActor_c*)create(EN_KURIBO, 0, &pos, &rot, 0); } else { Goomber = (dStageActor_c*)create(EN_PATA_KURIBO, 0, &pos, &rot, 0); } |