mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-10 03:05:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-08-04 20:52:16 -04:00
parent 6cd8f9719b
commit e05ebf1724
9 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_ice.h
+7 -1
View File
@@ -4,6 +4,7 @@
#include "f_op/f_op_actor.h"
#include "d/d_cc_d.h"
#include "d/d_a_obj.h"
#include "f_op/f_op_actor_mng.h"
class dBgW;
class dBgS;
@@ -18,7 +19,12 @@ class daObjIce_c : public fopAc_ac_c {
public:
s32 param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
void param_on_swSave() const { }
void param_on_swSave() const {
const s32 sw = param_get_swSave();
if (sw != 0xFF) {
fopAcM_onSwitch((fopAc_ac_c*)this, sw);
}
}
inline void setEffectMtx();
u8 chk_appear();
include/d/actor/d_a_obj_leaves.h
+6 -1
View File
@@ -27,7 +27,12 @@ public:
s32 param_get_itemNo() const { return daObj::PrmAbstract(this, PRM_ITEM_NO_W, PRM_ITEM_NO_S); }
s32 param_get_itemSaveBitNo() const { return daObj::PrmAbstract(this, PRM_ITEM_SAVE_BIT_NO_W, PRM_ITEM_SAVE_BIT_NO_S); }
s32 param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
void param_on_swSave() const { }
void param_on_swSave() const {
const s32 swSave = param_get_swSave();
if (swSave != 0xFF) {
fopAcM_onSwitch((fopAc_ac_c*)this, swSave);
}
}
bool chk_appear();
void setPEmitter(JPABaseEmitter*);
include/d/actor/d_a_pirate_flag.h
+2 -2
View File
@@ -24,7 +24,7 @@ public:
void setTevStr(dKy_tevstr_c* i_tevStr) { mTevStr = i_tevStr; }
cXyz* getPos() { return mPos[m87E]; }
cXyz* getNrm() { return mNrm[m87E]; }
cXyz* getBackNrm() { return m4F4[m87E]; }
cXyz* getBackNrm() { return mBackNrm[m87E]; }
cXyz* getOffsetVec() { return m74C; } // Guessed based on size in debug maps
s16 getEscapeNrmAngle() { return m87A; }
void changeCurrentPos() { m87E ^= 1; }
@@ -41,7 +41,7 @@ public:
/* 0x040 */ dKy_tevstr_c* mTevStr;
/* 0x044 */ cXyz mPos[2][25];
/* 0x29C */ cXyz mNrm[2][25];
/* 0x4F4 */ cXyz m4F4[2][25];
/* 0x4F4 */ cXyz mBackNrm[2][25];
/* 0x74C */ cXyz m74C[25];
/* 0x878 */ s16 m878;
/* 0x87A */ s16 m87A;