diff options
| author | Treeki <treeki@gmail.com> | 2013-02-07 03:48:19 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-07 03:48:19 +0100 |
| commit | 2c48652f74512e371b19ce2a8fbc4038742bced0 (patch) | |
| tree | e986b5dcfaf874e6a026fdf20e231bb634639401 /src/bossMegaGoomba.cpp | |
| parent | 74e1b36b62bfcbdc114e69c3071a989d245b800c (diff) | |
| download | kamek-2c48652f74512e371b19ce2a8fbc4038742bced0.tar.gz kamek-2c48652f74512e371b19ce2a8fbc4038742bced0.zip | |
a bunch of sprite fixes mixed into one commit, in traditional Newer fashion
Diffstat (limited to 'src/bossMegaGoomba.cpp')
| -rw-r--r-- | src/bossMegaGoomba.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp index 9ea7197..51ee044 100644 --- a/src/bossMegaGoomba.cpp +++ b/src/bossMegaGoomba.cpp @@ -270,17 +270,13 @@ int daMegaGoomba_c::tryHandleJumpedOn(ActivePhysics *apThis, ActivePhysics *apOt EnemyBounceValue = saveBounce; - if(ret == 1) { // regular jump + if(ret == 1 || ret == 3) { apOther->someFlagByte |= 2; if(this->takeHit(1)) { // kill me VEC2 eSpeed = {speed.x, speed.y}; killWithSpecifiedState(apOther->owner, &eSpeed, &dEn_c::StateID_DieOther); } - } else if(ret == 3) { // spinning - apOther->someFlagByte |= 2; - if(this->takeHit(1)) - doStateChange(&StateID_DieFall); } return ret; @@ -451,6 +447,7 @@ int daMegaGoomba_c::onCreate() { } int daMegaGoomba_c::onDelete() { + unstunPlayers(); return true; } |