summaryrefslogtreecommitdiff
path: root/src/topman.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-09-16 20:13:29 +0200
committerTreeki <treeki@gmail.com>2012-09-16 20:13:29 +0200
commit7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f (patch)
treec79a81d147511fcad842e8f1a64d9c0e58828ebb /src/topman.cpp
parentbe31f99777d00238151df5851042a9e896d24f74 (diff)
parenteb4b6edcbef13c80b0051abe9dc89c93e7a960d0 (diff)
downloadkamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.tar.gz
kamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.zip
Merge branch 'file-select' into level-select
Diffstat (limited to '')
-rw-r--r--src/topman.cpp19
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);