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

minor actor cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-01-23 04:25:43 -05:00
parent 4ca50bb60f
commit 2db5435315
7 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_disappear.h
+1 -1
View File
@@ -7,7 +7,7 @@
class disappear_class : public fopAc_ac_c {
public:
/* 0x290 */ request_of_phase_process_class mPhase; // Unused
/* 0x298 */ s32 mSwitchNo;
/* 0x298 */ s32 mItemBitNo;
/* 0x29C */ s16 mTimer;
};
include/d/actor/d_a_obj_ojtree.h
+1 -3
View File
@@ -23,11 +23,9 @@ namespace daObjOjtree {
BOOL Draw();
public:
/* Place member variables here */
/* 0x2C8 */ request_of_phase_process_class mPhs;
/* 0x2D0 */ J3DModel* mpModel;
/* 0x2D4 */ u8 field_0x2d4;
/* 0x2D5 */ u8 field_0x2d5[0x2d7 - 0x2d5];
/* 0x2D4 */ u8 mLockTimer;
};
};
include/d/actor/d_a_sea.h
+4 -4
View File
@@ -69,10 +69,10 @@ public:
void draw();
~daSea_packet_c() {}
f32 getMinX() {}
f32 getMinZ() {}
f32 getMaxX() {}
f32 getMaxZ() {}
f32 getMinX() { return mDrawMinX; }
f32 getMinZ() { return mDrawMinZ; }
f32 getMaxX() { return mDrawMaxX; }
f32 getMaxZ() { return mDrawMaxZ; }
GXTexObj* getSea0TexObj() { return &mTexSea0; }
GXTexObj* getSea1TexObj() { return &mTexSea1; }
GXTexObj* getYuraTexObj() { return &mTexYura; }
include/f_op/f_op_actor_mng.h
+1 -1
View File
@@ -540,7 +540,7 @@ BOOL stealItem_CB(void* actor);
fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);
s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_switchNo = -1);
s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1);
void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer);
void fopAcM_cancelCarryNow(fopAc_ac_c* i_this);
s32 fopAcM_otoCheck(fopAc_ac_c*, f32);