diff options
| author | Treeki <treeki@gmail.com> | 2013-01-13 20:05:10 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-01-13 20:05:10 +0100 |
| commit | d580364e7354d2c8c19d66d08515c905aac9581e (patch) | |
| tree | 5a129a1165e48b9d9227cf21c6721485a176196b /src | |
| parent | 66011f3237bab2a465a2c44cbab51822316a661d (diff) | |
| download | kamek-d580364e7354d2c8c19d66d08515c905aac9581e.tar.gz kamek-d580364e7354d2c8c19d66d08515c905aac9581e.zip | |
fixed star guy jumping
Diffstat (limited to '')
| -rw-r--r-- | src/shyguyGiants.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp index 133610e..c4d7a77 100644 --- a/src/shyguyGiants.cpp +++ b/src/shyguyGiants.cpp @@ -183,7 +183,14 @@ daShyGuyGiant *daShyGuyGiant::build() { void daShyGuyGiant::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){ } void daShyGuyGiant::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { } void daShyGuyGiant::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther){ - dAcPy_vf3F8(apOther->owner, this, 3); + int hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0); + if (hitType == 1 || hitType == 3) { + PlaySound(this, SE_EMY_CMN_STEP); + bouncePlayerWhenJumpedOn(apOther->owner); + } else { + dAcPy_vf3F8(apOther->owner, this, 3); + } + this->counter_504[apOther->owner->which_player] = 0xA; } |