diff options
author | Treeki <treeki@gmail.com> | 2012-09-16 20:13:29 +0200 |
---|---|---|
committer | Treeki <treeki@gmail.com> | 2012-09-16 20:13:29 +0200 |
commit | 7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f (patch) | |
tree | c79a81d147511fcad842e8f1a64d9c0e58828ebb /src/pumpkinGoomba.cpp | |
parent | be31f99777d00238151df5851042a9e896d24f74 (diff) | |
parent | eb4b6edcbef13c80b0051abe9dc89c93e7a960d0 (diff) | |
download | kamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.tar.gz kamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.zip |
Merge branch 'file-select' into level-select
Diffstat (limited to 'src/pumpkinGoomba.cpp')
-rw-r--r-- | src/pumpkinGoomba.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/pumpkinGoomba.cpp b/src/pumpkinGoomba.cpp index 64d98fc..1cc7a96 100644 --- a/src/pumpkinGoomba.cpp +++ b/src/pumpkinGoomba.cpp @@ -59,8 +59,6 @@ dGoombaPie *dGoombaPie::build() { /////////////////////// // Externs and States /////////////////////// - extern "C" void *PlaySound(dStageActor_c *, int soundID); - extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID); extern "C" void *EN_LandbarrelPlayerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther); extern "C" int SmoothRotation(short* rot, u16 amt, int unk2); extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1); @@ -132,19 +130,7 @@ dGoombaPie *dGoombaPie::build() { doStateChange(&StateID_Burst); } - struct DoSomethingCool { - u32 unk_01; //0000 - Vec3 pos; //0004 - Vec3 scale; //0010 - f32 unk_02; //001C - f32 unk_03; //0020 - f32 unk_04; //0024 - f32 unk_05; //0028 - f32 unk_06; //002C - f32 unk_07; //0030 - f32 unk_08; //0034 - f32 unk_09; //0038 - } goombIceBlock; + DoSomethingCool goombIceBlock; extern "C" void sub_80024C20(void); extern "C" void __destroy_arr(void*, void(*)(void), int, int); |