diff options
author | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
commit | d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806 (patch) | |
tree | c3f6657118d71abcd1ce3b4584b3e0472841e53f /src/topman.cpp | |
parent | 8d0a306f0a526a76182c8d2b513d7a0441d6f466 (diff) | |
parent | 5654d5c0a056f9cfc99ac608d16aa0a601b997f5 (diff) | |
download | kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.tar.gz kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.zip |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/topman.cpp')
-rw-r--r-- | src/topman.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/topman.cpp b/src/topman.cpp index edf75dd..5a313ae 100644 --- a/src/topman.cpp +++ b/src/topman.cpp @@ -73,13 +73,8 @@ daTopman *daTopman::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" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer); - extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daTopman *, Vec pos); - //FIXME make this dEn_c->used... extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1); extern "C" int SmoothRotation(short* rot, u16 amt, int unk2); @@ -194,19 +189,7 @@ daTopman *daTopman::build() { doStateChange(&StateID_Die); } - 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 - } my_struct; + DoSomethingCool my_struct; extern "C" void sub_80024C20(void); extern "C" void __destroy_arr(void*, void(*)(void), int, int); |