summaryrefslogtreecommitdiff
path: root/src/boss.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-03-22 21:06:44 -0500
committerColin Noga <Tempus@chronometry.ca>2012-03-22 21:06:44 -0500
commit6739d68df74fabb94f1525f5f6ae8ff3dfe0d907 (patch)
tree03fd8588a75191c040e9454cd07b34489b7c0a89 /src/boss.cpp
parent0ae957fcb9d1cb69602bf937c5111a184c3fbc79 (diff)
downloadkamek-6739d68df74fabb94f1525f5f6ae8ff3dfe0d907.tar.gz
kamek-6739d68df74fabb94f1525f5f6ae8ff3dfe0d907.zip
stuff
Diffstat (limited to 'src/boss.cpp')
-rw-r--r--src/boss.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/boss.cpp b/src/boss.cpp
index e5be583..a8a1a48 100644
--- a/src/boss.cpp
+++ b/src/boss.cpp
@@ -4,8 +4,6 @@
void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) {
- OSReport("Damage Player\n");
-
actor->dEn_c::playerCollision(apThis, apOther);
actor->_vf220(apOther->owner);
@@ -26,7 +24,6 @@ void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) {
void SetupKameck(daBoss *actor, daKameckDemo *Kameck) {
- OSReport("Stop BGM Music\n");
// Stop the BGM Music
StopBGMMusic();
@@ -35,44 +32,38 @@ void SetupKameck(daBoss *actor, daKameckDemo *Kameck) {
WLClass::instance->_4 = 4;
WLClass::instance->_8 = 0;
- OSReport("Enter Demo Mode\n");
MakeMarioEnterDemoMode();
// Make sure to use the correct position
Vec pos = (Vec){actor->pos.x - 124.0, actor->pos.y + 104.0, 3564.0};
S16Vec rot = (S16Vec){0, 0, 0};
- OSReport("Make Kameck\n");
// Create And use Kameck
actor->Kameck = (daKameckDemo*)actor->createChild(KAMECK_FOR_CASTLE_DEMO, (dStageActor_c*)actor, 0, &pos, &rot, 0);
actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoWait);
- OSReport("Kameck at %x\n", actor->Kameck);
}
void CleanupKameck(daBoss *actor, daKameckDemo *Kameck) {
// Clean up the flags and Kameck
- OSReport("Cleaning up ALL the Kamecks!\n");
dStage32C_c::instance->freezeMarioBossFlag = 0;
WLClass::instance->_8 = 1;
- OSReport("Fixing ALL the BGMs and Demo Modes!\n");
MakeMarioExitDemoMode();
StartBGMMusic();
actor->Kameck->Delete(1);
- OSReport("KAMEX DELETZORS\n");
}
bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float endScale, float yPosModifier, int timer) {
- if (timer == 130) { OSReport("Timer = 130 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); }
- if (timer == 400) { OSReport("Timer = 400 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); }
+ if (timer == 130) { actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); }
+ if (timer == 400) { actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); }
float scaleSpeed, yPosScaling;
- if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); OSReport("Timer = 150\n"); }
+ if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); }
if ((timer > 150) && (timer < 230)) {
scaleSpeed = (endScale -initialScale) / 80.0;
@@ -86,7 +77,6 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end
}
if (timer == 360) {
- OSReport("Timer = 360 - Make Effects\n");
Vec tempPos = (Vec){actor->pos.x - 40.0, actor->pos.y + 120.0, 3564.0};
SpawnEffect("Wm_ob_greencoinkira", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
SpawnEffect("Wm_mr_yoshiicehit_a", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
@@ -97,7 +87,7 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end
SpawnEffect("Wm_ob_keyget01_c", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
}
- if (timer > 420) { return true; OSReport("Timer = 420, returning true\n"); }
+ if (timer > 420) { return true; }
return false;
}