diff options
author | Stephen Simpson <megazig@gmail.com> | 2011-10-14 18:03:07 -0500 |
---|---|---|
committer | Stephen Simpson <megazig@gmail.com> | 2011-10-14 18:03:07 -0500 |
commit | c624775bf5f5c57757fdc5b24891dca83d7f81fd (patch) | |
tree | f9891e3f7805215768236aca33cd2a2c54af4742 | |
parent | 2aa6c935e2996c001079922863bcc4e62b6b0f61 (diff) | |
download | kamek-c624775bf5f5c57757fdc5b24891dca83d7f81fd.tar.gz kamek-c624775bf5f5c57757fdc5b24891dca83d7f81fd.zip |
anmChr working
-rw-r--r-- | kamek_pal.x | 1 | ||||
-rw-r--r-- | src/bossMegaGoomba.cpp | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kamek_pal.x b/kamek_pal.x index 67233c8..d804d25 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -546,6 +546,7 @@ SECTIONS { setScale__Q23m3d5mdl_cFP7Point3d = 0x8016A290; calcWorld__Q23m3d5mdl_cFb = 0x8016A2E0; bindAnim__Q23m3d5mdl_cFPQ23m3d6banm_cf = 0x8016a0c0; + vf1C__Q3m3d5mdl_cFv = 0x8016a080; SetupTextures_Player__FPQ23m3d5mdl_ci = 0x800B3E50; SetupTextures_Map__FPQ23m3d5mdl_ci = 0x800B3F50; diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp index da66d16..032cfa8 100644 --- a/src/bossMegaGoomba.cpp +++ b/src/bossMegaGoomba.cpp @@ -178,8 +178,8 @@ void daMegaGoomba_c::bindAnimChr_and_setUpdateRate(const char* name, int unk, fl } void daMegaGoomba_c::dieFall_Begin() { - this->bindAnimChr_and_setUpdateRate("split", 0, 0.0); - dSprite_c::dieFall_Begin(); + //this->bindAnimChr_and_setUpdateRate("split", 0, 0.0); + //dSprite_c::dieFall_Begin(); } //TODO make this real perty like void daMegaGoomba_c::dieFall_Execute() { @@ -322,7 +322,8 @@ int daMegaGoomba_c::onExecute() { int daMegaGoomba_c::onDraw() { bodyModel.scheduleForDrawing(); - animationChr.process(); + bodyModel._vf1C(); + //animationChr.process(); animationPat.process(); return true; } @@ -542,9 +543,8 @@ void daMegaGoomba_c::executeState_Walk() { Vec vctr; ConvertMatrixToTranslationVector(&mtx, &vctr); */ - this->animationChr.setCurrentFrame( this->animationChr.getCurrentFrame() + 1.0 ); - if(this->animationChr.getCurrentFrame() > 400.0) - this->animationChr.setCurrentFrame(1.0); + if(this->animationChr.isAnimationDone()) + this->animationChr.setCurrentFrame(0.0); //HandleAcceleration(this); //HandleXSpeed(this); |