diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-17 16:27:52 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-17 16:27:52 -0500 |
| commit | e6a945496b2252477f1d5015343ce7e6cdda0cc4 (patch) | |
| tree | 67aeb5a84b5423082c264d1c1326c9d443960839 /src/boss.cpp | |
| parent | e88fd1dcef52d4375fef655918886fc14bb1f40c (diff) | |
| download | kamek-e6a945496b2252477f1d5015343ce7e6cdda0cc4.tar.gz kamek-e6a945496b2252477f1d5015343ce7e6cdda0cc4.zip | |
Added Captina Bowser and his crew of merry sprites, plus some fixes for other junk.
Diffstat (limited to '')
| -rw-r--r-- | src/boss.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/boss.cpp b/src/boss.cpp index b484171..e5be583 100644 --- a/src/boss.cpp +++ b/src/boss.cpp @@ -12,8 +12,15 @@ void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) { // fix multiple player collisions via megazig actor->isDead = 0; actor->flags_4FC |= (1<<(31-7)); - actor->counter_504[apOther->owner->which_player] = 0; - OSReport("Player is good and hurt\n"); + if (apOther->owner->which_player == 255 ) { + actor->counter_504[0] = 0; + actor->counter_504[1] = 0; + actor->counter_504[2] = 0; + actor->counter_504[3] = 0; + } + else { + actor->counter_504[apOther->owner->which_player] = 0; + } } @@ -68,7 +75,6 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); OSReport("Timer = 150\n"); } if ((timer > 150) && (timer < 230)) { - OSReport("Timer = %d\n", timer); scaleSpeed = (endScale -initialScale) / 80.0; float modifier; |