mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-16 20:48:11 -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/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),