diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-06-24 19:34:56 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-06-24 19:34:56 -0500 |
| commit | 10fa535e98f3e1043b04895aaab2e916549fcf69 (patch) | |
| tree | 7dda2c5658961801414f2eef9e9137efadd26d78 /src/shyguy.cpp | |
| parent | fd286ae035b52d3d78e234d9f91b6610ae30def6 (diff) | |
| download | kamek-10fa535e98f3e1043b04895aaab2e916549fcf69.tar.gz kamek-10fa535e98f3e1043b04895aaab2e916549fcf69.zip | |
Lots of bug fixes, bowser improvements, summer sun hacks, JPN support, etc.
Diffstat (limited to '')
| -rw-r--r-- | src/shyguy.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp index f65ed17..8f311de 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -1050,15 +1050,13 @@ void daShyGuy::updateModelMatrices() { // Spike State /////////////// void daShyGuy::beginState_Spike() { - this->timer = 0; + this->timer = 80; spikeTurn = 0; } void daShyGuy::executeState_Spike() { if (this->timer == 0) { bindAnimChr_and_setUpdateRate("c18_OB_IDLE_R", 1, 0.0, 1.0); } - this->timer = this->timer + 1; - if (this->timer < 120) { // Always face Mario u8 facing = dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(this, this->pos); @@ -1162,6 +1160,9 @@ void daShyGuy::updateModelMatrices() { this->timer = 0; } } + + this->timer = this->timer + 1; + } void daShyGuy::endState_Spike() { } |