diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-05-22 14:18:34 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-22 14:18:34 -0500 |
| commit | d3b2d9fd92ede02ae06232c92e830e5819104f6e (patch) | |
| tree | ed9c055f856a78b4410231464385779228861153 /src/shyguy.cpp | |
| parent | 7d7fd4eb64f562978dbc001bffb53482af747a0b (diff) | |
| download | kamek-d3b2d9fd92ede02ae06232c92e830e5819104f6e.tar.gz kamek-d3b2d9fd92ede02ae06232c92e830e5819104f6e.zip | |
Minor shy guy fixes, topman noise fixes, samurshai wall fixes, removed animtile EFB copy speedup - untested commit
Diffstat (limited to 'src/shyguy.cpp')
| -rw-r--r-- | src/shyguy.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp index ee7a1bf..ddd2923 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -219,7 +219,8 @@ daShyGuy *daShyGuy::build() { if (name == EN_COIN || name == EN_EATCOIN || name == AC_BLOCK_COIN || name == EN_COIN_JUGEM || name == EN_COIN_ANGLE || name == EN_COIN_JUMP || name == EN_COIN_FLOOR || name == EN_COIN_VOLT || name == EN_COIN_WIND - || name == EN_BLUE_COIN || name == EN_COIN_WATER || name == EN_REDCOIN || name == EN_GREENCOIN) + || name == EN_BLUE_COIN || name == EN_COIN_WATER || name == EN_REDCOIN || name == EN_GREENCOIN + || name == EN_JUMPDAI || name == EN_ITEM) { return; } if (acState.getCurrentState() == &StateID_RealWalk) { @@ -381,7 +382,8 @@ daShyGuy *daShyGuy::build() { } // void daShyGuy::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { - // doStateChange(&StateID_DieFall); + + // dEn_C::collisionCat2_IceBall_15_YoshiIce(apThis, apOther); // } // These handle the ice crap @@ -761,7 +763,11 @@ int daShyGuy::onDraw() { void daShyGuy::updateModelMatrices() { // This won't work with wrap because I'm lazy. - matrix.translation(pos.x, pos.y - 2.0, pos.z); + + if (this->frzMgr._mstate == 1) + matrix.translation(pos.x, pos.y, pos.z); + else + matrix.translation(pos.x, pos.y - 2.0, pos.z); matrix.applyRotationYXZ(&rot.x, &rot.y, &rot.z); bodyModel.setDrawMatrix(matrix); |