diff options
| author | Treeki <treeki@gmail.com> | 2013-05-07 23:38:39 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-05-07 23:38:39 +0200 |
| commit | 377ad7df2409e1f3fb522937ee08a5351c36c4bc (patch) | |
| tree | 2d776e906028b478201a577fce8debdc3035a6b9 | |
| parent | c02e69115ed55eaf72493e3c98b64390d68c4a34 (diff) | |
| download | kamek-377ad7df2409e1f3fb522937ee08a5351c36c4bc.tar.gz kamek-377ad7df2409e1f3fb522937ee08a5351c36c4bc.zip | |
shyguy hitboxes improved
| -rw-r--r-- | src/shyguy.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 8f6d6f3..27c0d70 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -591,10 +591,16 @@ int daShyGuy::onCreate() { ActivePhysics::Info HitMeBaby; + // Note: if this gets changed, also change the point where the default + // values are assigned after de-ballooning HitMeBaby.xDistToCenter = 0.0; HitMeBaby.yDistToCenter = 12.0; - HitMeBaby.xDistToEdge = 10.0; - HitMeBaby.yDistToEdge = 12.0; + HitMeBaby.xDistToEdge = 8.0; + HitMeBaby.yDistToEdge = 12.0; + if (renderBalloon) { + HitMeBaby.yDistToCenter = 9.0f; + HitMeBaby.yDistToEdge = 9.0f; + } HitMeBaby.category1 = 0x3; HitMeBaby.category2 = 0x0; @@ -1331,6 +1337,9 @@ void daShyGuy::updateModelMatrices() { if (speed.y == 0.0) { SpawnEffect("Wm_en_sndlandsmk_s", 0, &(Vec){this->pos.x, this->pos.y, 0}, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); doStateChange(&StateID_GoDizzy); + + aPhysics.info.yDistToCenter = 12.0f; + aPhysics.info.yDistToEdge = 12.0f; } } void daShyGuy::endState_BalloonDrop() { |