diff options
Diffstat (limited to '')
| -rw-r--r-- | src/bossCaptainBowser.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp index ce85f29..710af77 100644 --- a/src/bossCaptainBowser.cpp +++ b/src/bossCaptainBowser.cpp @@ -99,7 +99,6 @@ daCaptainBowser *daCaptainBowser::build() { else if (this->damage > 20) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } - else { dEn_c::spriteCollision(apThis, apOther); } } void daCaptainBowser::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { @@ -250,10 +249,10 @@ int daCaptainBowser::onDraw() { ////////////////// void daCaptainBowser::beginState_Wait() { if (this->isAngry == 0) { - bindAnimChr_and_setUpdateRate("kp_wait", 1, 0.0, 1.0); + bindAnimChr_and_setUpdateRate("kp_wait", 1, 0.0, 1.5); } else { - bindAnimChr_and_setUpdateRate("kp_wait", 1, 0.0, 1.5); + bindAnimChr_and_setUpdateRate("kp_wait", 1, 0.0, 2.0); } } void daCaptainBowser::executeState_Wait() { @@ -286,12 +285,12 @@ int daCaptainBowser::onDraw() { if (this->chrAnimation.getCurrentFrame() == 60.0) { // throw back int num = GenerateRandomNumber(5); - CreateActor(10, 0x100 + ((num + 1) * 0x10), this->pos, 0, 0); + CreateActor(0x29F, 0x101 + ((num + 1) * 0x10), (Vec){pos.x-146.0, pos.y+122.0, pos.z}, 0, 0); } if (this->chrAnimation.getCurrentFrame() == 126.0) { // throw front int num = GenerateRandomNumber(4); - CreateActor(10, (num + 1) * 0x10, this->pos, 0, 0); + CreateActor(0x29F, ((num + 1) * 0x10) + 1, (Vec){pos.x-146.0, pos.y+122.0, pos.z}, 0, 0); } if (this->chrAnimation.isAnimationDone()) { @@ -322,7 +321,7 @@ int daCaptainBowser::onDraw() { void daCaptainBowser::executeState_Fire() { if (this->chrAnimation.getCurrentFrame() == 70) { // spit fire - CreateActor(KOOPA_FIRE, 0, this->pos, 0, 0); // Seems like nyb 5 has a setting, 2 bits long, maybe. + CreateActor(KOOPA_FIRE, 0x30, (Vec){pos.x-156.0, pos.y+128.0, pos.z}, 0, 0); // Seems like nyb 5 has a setting, 2 bits long, maybe. } if (this->chrAnimation.isAnimationDone()) { |