summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boss.cpp16
-rw-r--r--src/boss.h1
-rw-r--r--src/bossSamurshai.cpp2
-rw-r--r--src/bossThwompaDomp.cpp2
4 files changed, 16 insertions, 5 deletions
diff --git a/src/boss.cpp b/src/boss.cpp
index 22553ff..9ec7ad3 100644
--- a/src/boss.cpp
+++ b/src/boss.cpp
@@ -136,13 +136,23 @@ void BossExplode(daBoss *actor, Vec *pos) {
nw4r::snd::SoundHandle handle;
PlaySoundWithFunctionB4(SoundRelatedClass, &handle, STRM_BGM_SHIRO_BOSS_CLEAR, 1);
- MakeMarioEnterDemoMode();
+
+ //MakeMarioEnterDemoMode();
+ BossGoalForAllPlayers();
+}
+
+void BossGoalForAllPlayers() {
+ for (int i = 0; i < 4; i++) {
+ daPlBase_c *player = GetPlayerOrYoshi(i);
+ if (player)
+ player->setAnimePlayStandardType(2);
+ }
}
void PlayerVictoryCries(daBoss *actor) {
UpdateGameMgr();
- nw4r::snd::SoundHandle handle1, handle2, handle3, handle4;
+ /*nw4r::snd::SoundHandle handle1, handle2, handle3, handle4;
dAcPy_c *players[4];
for (int i = 0; i < 4; i++)
@@ -155,5 +165,5 @@ void PlayerVictoryCries(daBoss *actor) {
if (players[2] && strcmp(players[2]->states2.getCurrentState()->getName(), "dAcPy_c::StateID_Balloon"))
PlaySoundWithFunctionB4(SoundRelatedClass, &handle3, SE_VOC_KO_CLEAR_BOSS, 1);
if (players[3] && strcmp(players[3]->states2.getCurrentState()->getName(), "dAcPy_c::StateID_Balloon"))
- PlaySoundWithFunctionB4(SoundRelatedClass, &handle4, SE_VOC_KO2_CLEAR_BOSS, 1);
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle4, SE_VOC_KO2_CLEAR_BOSS, 1);*/
}
diff --git a/src/boss.h b/src/boss.h
index 6bdcf61..a5d38e9 100644
--- a/src/boss.h
+++ b/src/boss.h
@@ -40,6 +40,7 @@ void OutroSetup(daBoss* actor);
bool ShrinkBoss(daBoss *actor, Vec *pos, float scale, int timer);
void BossExplode(daBoss* actor, Vec *pos);
void PlayerVictoryCries(daBoss* actor);
+void BossGoalForAllPlayers();
#endif
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp
index 1f0906a..d765293 100644
--- a/src/bossSamurshai.cpp
+++ b/src/bossSamurshai.cpp
@@ -409,7 +409,7 @@ void daSamurshai::updateModelMatrices() {
WLClass::instance->_4 = 4;
WLClass::instance->_8 = 0;
- MakeMarioEnterDemoMode();
+ BossGoalForAllPlayers();
// Make sure to use the correct position
Vec KamekPos = (Vec){pos.x - 124.0, pos.y + 104.0, 3564.0};
diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp
index 18ea570..e63191b 100644
--- a/src/bossThwompaDomp.cpp
+++ b/src/bossThwompaDomp.cpp
@@ -453,7 +453,7 @@ int daEnMegaDosun_c::onDelete() {
if (this->timer == 60) {
nw4r::snd::SoundHandle handle;
PlaySoundWithFunctionB4(SoundRelatedClass, &handle, STRM_BGM_SHIRO_BOSS_CLEAR, 1);
- MakeMarioEnterDemoMode();
+ BossGoalForAllPlayers();
}
if (this->timer == 120) {