mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tornado (#697)

Browse Source 
* d_a_tornado 100%

* update member names

* fixes

* fix constant

* add compiler flag

* return BOOL type

* Apply suggestions from code review

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Ross Newman
2025-02-28 01:49:58 -05:00
committed by GitHub
parent c61fe4a335
commit fdfb69f055
5 changed files with 337 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_ship.h
+9 -6
View File
@@ -23,7 +23,7 @@ public:
u32 getTactWarpID() { return mTactWarpID; }
void setTactWarpID(u32 warpID) { mTactWarpID = warpID; }
bool unknown_inline_TODO() const { return m041C || m0424; }
bool unknown_inline_TODO() const { return mTornadoActor || m0424; }
void checkCraneMode() const {}
void checkCraneUpEnd() const {}
@@ -58,12 +58,15 @@ public:
void getTactJntMtx() {}
void getTillerAngleRate() {}
void getTillerTopPosP() {}
void getTornadoActor() {}
fopAc_ac_c* getTornadoActor() { return mTornadoActor; }
void getWhirlActor() {}
void offCraneHookFlg() {}
void offFantomGanonBattle() {}
void offStateFlg(daSHIP_SFLG) {}
void offTornadoFlg() {}
void offTornadoFlg() {
mTornadoID = fpcM_ERROR_PROCESS_ID_e;
mTornadoActor = NULL;
}
void offWhirlFlg() {}
void onCb1Ride() {}
void onCraneHookFlg() {}
@@ -74,7 +77,7 @@ public:
void onSceneChange() {}
void onShortHitFlg() {}
void onStateFlg(daSHIP_SFLG) {}
void onTornadoFlg(unsigned long) {}
void onTornadoFlg(u32 tornadoID) { mTornadoID = tornadoID; }
void onWhirlFlg(unsigned long, short) {}
void onWhirlFlgDirect(unsigned long, short) {}
void setAtnPos(const cXyz*) {}
@@ -238,8 +241,8 @@ public:
/* 0x040C */ f32 m040C;
/* 0x0410 */ int mGridId;
/* 0x0414 */ daGrid_c* mpGrid;
/* 0x0418 */ int m0418;
/* 0x041C */ fopAc_ac_c* m041C;
/* 0x0418 */ u32 mTornadoID;
/* 0x041C */ fopAc_ac_c* mTornadoActor;
/* 0x0420 */ u32 m0420;
/* 0x0424 */ fopAc_ac_c* m0424;
/* 0x0428 */ u8 m0428[0x042C - 0x0428];
include/d/actor/d_a_tornado.h
+34 -4
View File
@@ -2,6 +2,15 @@
#define D_A_TORNADO_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_particle.h"
class daTornado_HIO_c0 {
public:
static const float move_dis;
static const float start_dis;
};
class daTornado_c : public fopAc_ac_c {
public:
@@ -12,15 +21,36 @@ public:
void getSmallScaleEnd() {}
void setScaleOn() {}
void jointCallBack(int);
BOOL jointCallBack(int);
BOOL draw();
BOOL execute();
void tornado_delete();
void createHeap();
BOOL tornado_delete();
BOOL createHeap();
s32 create();
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel;
/* 0x29c */ mDoExt_bckAnm mBck;
/* 0x2ac */ mDoExt_btkAnm mBtk;
/* 0x2c0 */ mDoExt_brkAnm mBrk;
/* 0x2d8 */ J3DModel* mpModelUnder;
/* 0x2dc */ mDoExt_bckAnm mBckUnder;
/* 0x2ec */ mDoExt_btkAnm mBtkUnder;
/* 0x300 */ mDoExt_brkAnm mBrkUnder;
/* 0x318 */ short mAngle1;
/* 0x31a */ short mAngle2;
/* 0x31c */ short m31c;
/* 0x31e */ short mPtclTimer;
/* 0x320 */ float mBtkFrame;
/* 0x324 */ float mBtkUnderFrame;
/* 0x328 */ float mBrkFrame;
/* 0x32c */ float m32c;
/* 0x330 */ float mJointX[11];
/* 0x35c */ float mJointZ[11];
/* 0x388 */ float mJointScale[11];
/* 0x3b4 */ cXyz mCenter;
/* 0x3c0 */ dPa_followEcallBack mPtclCb;
};
#endif /* D_A_TORNADO_H */
include/d/d_kankyo_wether.h
+1
View File
@@ -370,5 +370,6 @@ void dKyw_evt_wind_set_go();
void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* i_direction, f32* i_power);
cXyz dKyw_get_AllWind_vecpow(cXyz* param_0);
BOOL dKyw_gbwind_use_check();
void dKyw_tornado_Notice(cXyz* param_0);
#endif /* D_KANKYO_WETHER_H */