diff options
| -rw-r--r-- | src/bossKoopaThrow.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bossKoopaThrow.cpp b/src/bossKoopaThrow.cpp index d330651..0fee6ba 100644 --- a/src/bossKoopaThrow.cpp +++ b/src/bossKoopaThrow.cpp @@ -23,7 +23,7 @@ static const TypeInfo types[6] = { {"choropoo", "g3d/choropoo.brres", "spanner", "Wm_en_hit", 0, SE_BOSS_JR_FLOOR_BREAK, 0, 8.0f, 2.0f, 0, 0, 0x1000}, {"choropoo", "g3d/choropoo.brres", "spanner", "Wm_en_burst_s", 0, SE_BOSS_JR_BOMB_BURST, 0, 12.0f, 2.0f, 0, 0, 0x1000}, {"koopa_clown_bomb", "g3d/koopa_clown_bomb.brres", "koopa_clown_bomb", "Wm_en_burst_s", SE_EMY_ELCJ_THROW, SE_BOSS_JR_BOMB_BURST, 0, 16.0f, 0.8f, 0x200, 0x800, 0x1000}, - {"bros", "g3d/t00.brres", "bros_hammer", "Wm_en_hit", 0, SE_OBJ_HAMMER_HIT_BOTH, SE_EMY_MEGA_BROS_HAMMER, 16.0f, 2.0f, 0, 0, 0x1000}, + {"bros", "g3d/t00.brres", "bros_hammer", "Wm_en_hit", 0, SE_OBJ_HAMMER_HIT_BOTH, 0, 16.0f, 2.0f, 0, 0, 0x1000}, {"dossun", "g3d/t02.brres", "dossun", "Wm_en_hit", SE_EMY_DOSSUN, SE_EMY_DOSSUN_DEAD, 0, 14.0f, 1.0f, 0, 0, 0}, {"KoopaShip", "g3d/present.brres", "PresentBox_penguin", "Wm_dm_presentopen",SE_DEMO_OP_PRESENT_THROW_2400f, SE_DEMO_OP_PRESENT_BOX_BURST, 0, 20.0f, 1.0f, 0x20, 0x40, 0x200} }; @@ -58,6 +58,8 @@ class daKoopaThrow : public dEn_c { bool playsAnim; m3d::anmChr_c chrAnim; + nw4r::snd::SoundHandle hammerSound; + const TypeInfo *currentInfo; static daKoopaThrow *build(); @@ -259,6 +261,10 @@ int daKoopaThrow::onCreate() { PlaySound(this, currentInfo->launchSound); } + if (Type == 3) { + PlaySoundWithFunctionB4(SoundRelatedClass, &hammerSound, SE_EMY_MEGA_BROS_HAMMER, 1); + } + doStateChange(&StateID_Straight); this->onExecute(); @@ -267,6 +273,8 @@ int daKoopaThrow::onCreate() { int daKoopaThrow::onDelete() { + if (hammerSound.Exists()) + hammerSound.Stop(10); return true; } |