mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-06 18:02:28 -04:00
Missed some spots where cPhs_State should be used
This commit is contained in:
@@ -91,7 +91,7 @@ public:
|
||||
static void incTclBeat();
|
||||
|
||||
inline BOOL draw();
|
||||
inline int create();
|
||||
inline cPhs_State create();
|
||||
inline BOOL execute();
|
||||
inline void deleteSub();
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
void eff_water_splash();
|
||||
bool bombDelete();
|
||||
BOOL createHeap();
|
||||
int create();
|
||||
cPhs_State create();
|
||||
void create_init();
|
||||
|
||||
enum State_e {
|
||||
|
||||
@@ -9,7 +9,7 @@ public:
|
||||
void daHmlifDelete();
|
||||
void CreateHeap();
|
||||
s32 Create();
|
||||
void daHmlifCreate();
|
||||
cPhs_State daHmlifCreate();
|
||||
void set_mtx();
|
||||
void Execute(float(**)[3][4]);
|
||||
void move();
|
||||
|
||||
@@ -32,7 +32,7 @@ public:
|
||||
BOOL _daIball_draw();
|
||||
BOOL _daIball_execute();
|
||||
BOOL _daIball_delete();
|
||||
s32 _daIball_create();
|
||||
cPhs_State _daIball_create();
|
||||
BOOL CreateHeap();
|
||||
|
||||
static void init();
|
||||
|
||||
@@ -28,7 +28,7 @@ public:
|
||||
void getArg();
|
||||
bool _execute();
|
||||
bool _draw();
|
||||
int _create();
|
||||
cPhs_State _create();
|
||||
bool _delete();
|
||||
|
||||
public:
|
||||
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
void set_mtx();
|
||||
void set_mtx_base(J3DModel*, cXyz, csXyz);
|
||||
void CreateInit();
|
||||
s32 _daItem_create();
|
||||
cPhs_State _daItem_create();
|
||||
BOOL _daItem_execute();
|
||||
void mode_proc_call();
|
||||
void execInitNormalDirection();
|
||||
|
||||
@@ -106,7 +106,7 @@ static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
|
||||
class daMP_c : public fopAc_ac_c {
|
||||
public:
|
||||
u32 daMP_c_Get_arg_data();
|
||||
int daMP_c_Init();
|
||||
cPhs_State daMP_c_Init();
|
||||
BOOL daMP_c_Finish();
|
||||
BOOL daMP_c_Main();
|
||||
BOOL daMP_c_Draw();
|
||||
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
void anime_proc();
|
||||
void checkRange(int);
|
||||
BOOL CreateHeap();
|
||||
s32 CreateInit();
|
||||
cPhs_State CreateInit();
|
||||
void event_move();
|
||||
fopAc_ac_c* getBeamActor(fpc_ProcID);
|
||||
void search_beam_proc_init();
|
||||
|
||||
@@ -85,7 +85,7 @@ public:
|
||||
daNpcPeople_c();
|
||||
cPhs_State _create();
|
||||
BOOL createHeap();
|
||||
s32 createInit();
|
||||
cPhs_State createInit();
|
||||
bool _delete();
|
||||
bool _draw();
|
||||
bool _execute();
|
||||
|
||||
@@ -28,7 +28,7 @@ public:
|
||||
daNpcRoten_c();
|
||||
cPhs_State _create();
|
||||
BOOL createHeap();
|
||||
s32 createInit();
|
||||
cPhs_State createInit();
|
||||
bool _delete();
|
||||
bool _draw();
|
||||
bool _execute();
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
class daObj_Bscurtain_c : public fopAc_ac_c {
|
||||
public:
|
||||
BOOL CreateHeap();
|
||||
s32 CreateInit();
|
||||
cPhs_State CreateInit();
|
||||
inline cPhs_State _create();
|
||||
inline bool _delete();
|
||||
inline bool _execute();
|
||||
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
|
||||
cPhs_State _create();
|
||||
BOOL createHeap();
|
||||
s32 createInit();
|
||||
cPhs_State createInit();
|
||||
BOOL _delete();
|
||||
BOOL _draw();
|
||||
BOOL _execute();
|
||||
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
|
||||
cPhs_State _create();
|
||||
BOOL createHeap();
|
||||
s32 createInit();
|
||||
cPhs_State createInit();
|
||||
BOOL _delete();
|
||||
BOOL _draw();
|
||||
BOOL _execute();
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
|
||||
void set_mtx();
|
||||
BOOL CreateHeap();
|
||||
s32 CreateInit();
|
||||
cPhs_State CreateInit();
|
||||
|
||||
static int getCreateCount();
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
bool _draw();
|
||||
void createInit();
|
||||
void getArg();
|
||||
int _create();
|
||||
cPhs_State _create();
|
||||
bool _delete();
|
||||
|
||||
static const char m_arc_name[];
|
||||
|
||||
@@ -8,7 +8,7 @@ public:
|
||||
void chkFlag(unsigned char) {}
|
||||
void setFlag(unsigned char) {}
|
||||
|
||||
inline s32 _daSaku_create();
|
||||
inline cPhs_State _daSaku_create();
|
||||
inline BOOL _daSaku_delete();
|
||||
inline BOOL _daSaku_draw();
|
||||
inline BOOL _daSaku_execute();
|
||||
|
||||
@@ -13,7 +13,7 @@ struct daShopItem_c_m_data {
|
||||
|
||||
class daShopItem_c : public daItemBase_c {
|
||||
public:
|
||||
inline int _create();
|
||||
inline cPhs_State _create();
|
||||
inline bool _delete();
|
||||
void setTevType(int type) { mTevType = type; }
|
||||
|
||||
|
||||
@@ -45,10 +45,10 @@ public:
|
||||
|
||||
inline BOOL draw();
|
||||
BOOL execute();
|
||||
s32 commonShapeSet();
|
||||
s32 effectShapeSet();
|
||||
s32 envShapeSet();
|
||||
s32 bgCheckSet();
|
||||
cPhs_State commonShapeSet();
|
||||
cPhs_State effectShapeSet();
|
||||
cPhs_State envShapeSet();
|
||||
cPhs_State bgCheckSet();
|
||||
void searchRoomNo();
|
||||
void lightReady();
|
||||
BOOL checkEnv();
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
class daYougan_c : public fopAc_ac_c {
|
||||
public:
|
||||
void _daYougan_draw();
|
||||
void _daYougan_execute();
|
||||
void _daYougan_isdelete();
|
||||
void _daYougan_delete();
|
||||
void useHeapInit();
|
||||
void _daYougan_create();
|
||||
BOOL _daYougan_draw();
|
||||
BOOL _daYougan_execute();
|
||||
BOOL _daYougan_isdelete();
|
||||
BOOL _daYougan_delete();
|
||||
BOOL useHeapInit();
|
||||
cPhs_State _daYougan_create();
|
||||
|
||||
public:
|
||||
/* Place member variables here */
|
||||
|
||||
@@ -3200,7 +3200,6 @@ inline void dComIfGp_setFmapData(void * pData) { g_dComIfG_gameInfo.play.setFmap
|
||||
|
||||
class request_of_phase_process_class;
|
||||
cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name);
|
||||
int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap);
|
||||
int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName);
|
||||
|
||||
inline int dComIfG_setObjectRes(const char* name, u8 direction, JKRHeap* heap) {
|
||||
|
||||
+2
-2
@@ -73,7 +73,7 @@ public:
|
||||
|
||||
class dDoor_key2_c {
|
||||
public:
|
||||
void keyResLoad();
|
||||
cPhs_State keyResLoad();
|
||||
void keyResDelete();
|
||||
void keyInit(dDoor_info_c*);
|
||||
BOOL keyProc();
|
||||
@@ -132,7 +132,7 @@ public:
|
||||
void offUse() {}
|
||||
void onUse(u8) {}
|
||||
|
||||
s32 resLoad();
|
||||
cPhs_State resLoad();
|
||||
void resDelete();
|
||||
BOOL create();
|
||||
void setAnm(u8);
|
||||
|
||||
Reference in New Issue
Block a user