summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-28 13:19:01 +0100
committerTreeki <treeki@gmail.com>2012-10-28 13:19:01 +0100
commitdd90d6a3cbd0288a1138122106b9f4f819f5bbba (patch)
treeb472a6abd63528a953dcea910ae637ea3999f497 /include
parent29bdbddab8b9cf8cce5d548949b9d5b98e5b538a (diff)
downloadkamek-dd90d6a3cbd0288a1138122106b9f4f819f5bbba.tar.gz
kamek-dd90d6a3cbd0288a1138122106b9f4f819f5bbba.zip
added the on-death anim/sound
Diffstat (limited to '')
-rwxr-xr-xinclude/game.h2
-rwxr-xr-xinclude/stage.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/include/game.h b/include/game.h
index c4a9238..bb64d4e 100755
--- a/include/game.h
+++ b/include/game.h
@@ -2514,7 +2514,7 @@ public:
virtual void getModelMatrix(u32 unk, MtxPtr dest); // 800D5820
virtual int _vf54(); // 80318D0C
virtual bool _vf58(int type, char *buf, bool unk); // 800D6930
- virtual void startAnimation(int id, float frame, float unk, float updateRate); // 800D5EC0
+ virtual void startAnimation(int id, float updateRate, float unk, float frame); // 800D5EC0
virtual int _vf60(); // 800D6920
virtual void _vf64(int id, float unk1, float unk2, float unk3); // 800D62F0
virtual void _vf68(int id, float unk); // 800D63E0
diff --git a/include/stage.h b/include/stage.h
index 39d1349..8a97dab 100755
--- a/include/stage.h
+++ b/include/stage.h
@@ -83,8 +83,8 @@ enum SceneParameters {
enum PowerupStoreTypes {
BEAT_LEVEL = 0, // Keeps powerups
- EXIT_LEVEL = 1, // Loses powerups, resets to previous state
- LOSE_LEVEL = 2 // Loses everything
+ LOSE_LEVEL = 1, // Loses everything
+ EXIT_LEVEL = 2 // Loses powerups, resets to previous state
};
@@ -101,6 +101,8 @@ enum Wipes {
void ExitStage(int scene, int sceneParams, int powerupStoreType, int wipe);
+extern PowerupStoreTypes LastPowerupStoreType;
+