mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-25 06:41:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rando-mod

Browse Source
This commit is contained in:
Luke Street
2026-08-23 22:37:50 -06:00
parent 622b782614 a775418c66
commit ba324dfdf6
18 changed files with 260 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_itembase.h
+9
View File
@@ -32,6 +32,12 @@ struct daItemBase_data {
class daItemBase_c : public fopAc_ac_c {
public:
u8 getItemNo();
#if TARGET_PC
u8 getDisplayItemNo() const {
return mDisplayItemNo != 0xFF ? mDisplayItemNo : m_itemNo;
}
void setDisplayItemNo(u8 itemNo) { mDisplayItemNo = itemNo; }
#endif
void hide();
void show();
void changeDraw();
@@ -79,6 +85,9 @@ public:
/* 0x928 */ s16 m_get_timer;
/* 0x92A */ u8 m_itemNo;
/* 0x92B */ u8 field_0x92b;
#if TARGET_PC
u8 mDisplayItemNo = 0xFF;
#endif
};
#endif /* D_A_D_A_ITEMBASE_H */
include/f_op/f_op_actor_mng.h
+4 -2
View File
@@ -532,10 +532,12 @@ s32 fopAcM_delete(fpc_ProcID i_actorID);
fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos,
int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_argument,
createFunc i_createFunc IF_DUSK_ARG(u32 i_itemGiveTag = 0));
createFunc i_createFunc IF_DUSK_ARG(u32 i_itemGiveTag = 0)
IF_DUSK_ARG(u8 i_itemOriginalNo = 0xFF));
fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
const csXyz* i_angle, const cXyz* i_scale, s8 i_argument IF_DUSK_ARG(u32 i_itemGiveTag = 0));
const csXyz* i_angle, const cXyz* i_scale, s8 i_argument IF_DUSK_ARG(u32 i_itemGiveTag = 0)
IF_DUSK_ARG(u8 i_itemOriginalNo = 0xFF));
inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* params) {
return fpcM_Create(i_procName, i_createFunc,params);