diff options
| author | Colin Noga <Tempus@Spectrum-Song.local> | 2011-09-23 02:22:37 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@Spectrum-Song.local> | 2011-09-23 02:22:37 -0500 |
| commit | 8f0baae495ade1b065d73875092a3bb479787ada (patch) | |
| tree | 9799fb18ae512d4a71150352c8c048d8d9748c52 /src/mrsun.cpp | |
| parent | 9b1df8223e713762897d4a8a8508d0c4843570ee (diff) | |
| download | kamek-8f0baae495ade1b065d73875092a3bb479787ada.tar.gz kamek-8f0baae495ade1b065d73875092a3bb479787ada.zip | |
Added FuzzyBear and some fixes to Mr.sun
Diffstat (limited to '')
| -rwxr-xr-x | src/mrsun.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mrsun.cpp b/src/mrsun.cpp index 88dd7fd..19b5902 100755 --- a/src/mrsun.cpp +++ b/src/mrsun.cpp @@ -88,6 +88,7 @@ void daMrSun_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActiveP OSReport("Hit Iceball"); if (this->settings == 0) { // It's a sun if (this->sunDying == 5) { + this->isDead = 1; doStateChange(&StateID_DieIceVanish); } else { this->sunDying = this->sunDying + 1; } @@ -111,7 +112,7 @@ void daMrSun_c::dieFall_Execute() { this->dying = this->dying + 0.15; this->pos.x = this->pos.x + 0.15; - this->pos.y = this->pos.y + ((-0.2 * (this->dying*this->dying)) + 5); + this->pos.y = this->pos.y - ((-0.2 * (this->dying*this->dying)) + 5); this->dEn_c::dieFall_Execute(); @@ -202,7 +203,7 @@ int daMrSun_c::onCreate() { this->timer = 0; this->xSpiralOffset = 0.0; this->ySpiralOffset = 0.0; - this->dying = -15; + this->dying = -5; this->sunDying = 0; this->pos.z = 3300.00; @@ -272,7 +273,7 @@ void daMrSun_c::beginState_Follow() { this->timer = 0; this->rot.x = 18000; this->rot.y = 0; -// this->rot.z = 18000; + this->rot.z = 0; } void daMrSun_c::executeState_Follow() { |