mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-03 01:54:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add attention flags enum, use enums in more places

Browse Source
This commit is contained in:
LagoLunatic
2023-10-15 00:45:59 -04:00
parent 98140ed1cd
commit 0ca314c746
24 changed files with 252 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGeometry.h
+1 -1
View File
@@ -259,7 +259,7 @@ struct TVec3<f32> {
}
void setLength(f32 len) {
f32 sq = squared();
f32 sq = squared();
if (sq <= FLT_EPSILON * 32.0f) {
return;
}
include/SSystem/SComponent/c_bg_s_gnd_chk.h
+2 -3
View File
@@ -8,10 +8,10 @@
class cBgS_GndChk : public cBgS_Chk, public cBgS_PolyInfo {
public:
cBgS_GndChk();
void SetPos(cXyz const* pos) {
void SetPos(cXyz* pos) {
m_pos = *pos;
}
void SetPos(Vec const*);
void SetPos(Vec*);
void PreCheck();
virtual ~cBgS_GndChk() {}
@@ -19,7 +19,6 @@ public:
f32 GetNowY() const { return mNowY; }
void SetNowY(f32 y) { mNowY = y; }
cXyz* GetPointP() { return &m_pos; }
void SetPos(cXyz* pos) { m_pos.set(*pos); }
u32 GetWallPrecheck() const { return mWallPrecheck; }
void OffWall() { mFlags &= ~2; }
include/SSystem/SComponent/c_cc_d.h
+6
View File
@@ -30,12 +30,18 @@ enum cCcD_ObjAtType {
/* 0x00000100 */ AT_TYPE_WATER = (1 << 8),
/* 0x00000200 */ AT_TYPE_FIRE = (1 << 9),
/* 0x00000400 */ AT_TYPE_MACHETE = (1 << 10),
/* 0x00000800 */ AT_TYPE_UNK800 = (1 << 11),
/* 0x00001000 */ AT_TYPE_UNK1000 = (1 << 12),
/* 0x00002000 */ AT_TYPE_UNK2000 = (1 << 13),
/* 0x00004000 */ AT_TYPE_NORMAL_ARROW = (1 << 14),
/* 0x00010000 */ AT_TYPE_SKULL_HAMMER = (1 << 16),
/* 0x00020000 */ AT_TYPE_UNK20000 = (1 << 17),
/* 0x00040000 */ AT_TYPE_FIRE_ARROW = (1 << 18),
/* 0x00080000 */ AT_TYPE_ICE_ARROW = (1 << 19),
/* 0x00100000 */ AT_TYPE_LIGHT_ARROW = (1 << 20),
/* 0x00200000 */ AT_TYPE_LEAF_WIND = (1 << 21),
/* 0x00400000 */ AT_TYPE_UNK400000 = (1 << 22),
/* 0x00800000 */ AT_TYPE_UNK800000 = (1 << 23),
/* 0x01000000 */ AT_TYPE_STALFOS_MACE = (1 << 24),
/* 0x04000000 */ AT_TYPE_DARKNUT_SWORD = (1 << 26),
/* 0x08000000 */ AT_TYPE_GRAPPLING_HOOK = (1 << 27),
include/d/d_bg_s_roof_chk.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
virtual ~dBgS_RoofChk() {}
void SetPos(cXyz const& pos) { m_pos = pos; }
void SetPos(cXyz& pos) { m_pos = pos; }
cXyz* GetPosP() { return &m_pos; }
private:
include/f_op/f_op_actor.h
+17 -1
View File
@@ -46,6 +46,22 @@ enum fopAc_Group_e {
fopAc_NPC_e,
};
enum fopAc_AttentionFlag_e {
fopAc_Attn_LOCKON_MISC_e = 0x00000001,
fopAc_Attn_LOCKON_TALK_e = 0x00000002,
fopAc_Attn_LOCKON_ENEMY_e = 0x00000004,
fopAc_Attn_ACTION_TALK_e = 0x00000008,
fopAc_Attn_ACTION_CARRY_e = 0x00000010,
fopAc_Attn_ACTION_DOOR_e = 0x00000020,
fopAc_Attn_ACTION_TREASURE_e = 0x00000040,
fopAc_Attn_ACTION_SHIP_e = 0x00000080,
fopAc_Attn_TALKFLAG_NOTALK_e = 0x2000000,
fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x4000000,
fopAc_Attn_TALKFLAG_LOOK_e = 0x8000000,
fopAc_Attn_TALKFLAG_CHECK_e = 0x20000000,
fopAc_Attn_TALKFLAG_READ_e = 0x40000000,
};
enum fopAc_Cull_e {
fopAc_CULLBOX_0_e,
fopAc_CULLBOX_1_e,
@@ -131,7 +147,7 @@ public:
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
BOOL checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
bool checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
bool checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }