mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-16 04:44:26 -04:00
shand OK, ship 99.8%, add some missing inlines
This commit is contained in:
@@ -22,11 +22,11 @@ public:
|
||||
bool _draw();
|
||||
|
||||
public:
|
||||
/* 0x0290 */ u8 m0290[0x2216 - 0x290];
|
||||
/* 0x0290 */ u8 m0290[0x2200 - 0x290];
|
||||
/* 0x2200 */ f32 m2200;
|
||||
/* 0x2204 */ u8 m2219[0x2216 - 0x2204];
|
||||
/* 0x2216 */ s16 m2216;
|
||||
/* 0x2218 */ u8 m2218;
|
||||
/* 0x2219 */ u8 m2219[0x2220 - 0x2219];
|
||||
/* 0x2220 */ f32 m2220;
|
||||
};
|
||||
|
||||
class daHo_HIO_c {
|
||||
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
void getBeltSpeed() const {}
|
||||
void getBodyMtx() {}
|
||||
s16 getCannonAngleX() const { return shape_angle.x + m0396 - 0x4000; }
|
||||
void getCannonAngleY() const {}
|
||||
s16 getCannonAngleY() const { return shape_angle.y + m0394; }
|
||||
void getCraneAngle() const {}
|
||||
void getCraneBaseAngle() const {}
|
||||
void getCraneHookAngleY() const {}
|
||||
@@ -125,8 +125,8 @@ public:
|
||||
void onShortHitFlg() {}
|
||||
void onStateFlg(daSHIP_SFLG flag) { mStateFlag |= flag; }
|
||||
void onTornadoFlg(u32 tornadoID) { mTornadoID = tornadoID; }
|
||||
void onWhirlFlg(unsigned long, short) {}
|
||||
void onWhirlFlgDirect(unsigned long, short) {}
|
||||
void onWhirlFlg(u32, s16) {}
|
||||
void onWhirlFlgDirect(u32, s16) {}
|
||||
void setAtnPos(const cXyz*) {}
|
||||
void setCannon() {}
|
||||
void setCrane() {}
|
||||
|
||||
@@ -2977,7 +2977,7 @@ inline s32 dComIfGp_demo_mode() {
|
||||
}
|
||||
|
||||
inline dDemo_actor_c* dComIfGp_demo_getActor(u8 id) {
|
||||
return g_dComIfG_gameInfo.play.getDemo()->mDemoObj.getActor(id);
|
||||
return g_dComIfG_gameInfo.play.getDemo()->getObject()->getActor(id);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -241,6 +241,10 @@ public:
|
||||
void remove();
|
||||
bool update();
|
||||
|
||||
dDemo_system_c* getSystem() { return mSystem;}
|
||||
JStudio::TControl* getControl() { return mControl; }
|
||||
dMesg_tControl* getMesgControl() { return mMesgControl; }
|
||||
dDemo_object_c* getObject() { return &mDemoObj; }
|
||||
int getFrame() { return mFrame; }
|
||||
u32 getFrameNoMsg() { return mFrameNoMsg; }
|
||||
s32 getMode() { return mMode; }
|
||||
|
||||
Reference in New Issue
Block a user