isHitWallKinopioWalk and checkBGCrossWall matching

Also use the BgCross enums across the file

Author: RootCubed

include/game/bases/d_a_player_base.hpp

@@ -311,6 +311,72 @@ class daPlBase_c : public dActor_c {
         POWER_CHANGE_2 = 2
     };
 
+
+    /// @unofficial
+    enum BgCross1_e {
+        BGC_IS_FOOT = BIT_FLAG(0),
+        BGC_IS_HEAD = BIT_FLAG(1),
+        BGC_IS_WALL = BIT_FLAG(2),
+        BGC_WALL_TOUCH_L = BIT_FLAG(3),
+        BGC_WALL_TOUCH_R = BIT_FLAG(4),
+        BGC_WALL_TOUCH_L_2 = BIT_FLAG(5),
+        BGC_WALL_TOUCH_R_2 = BIT_FLAG(6),
+        BGC_CARRY_RELATED_L = BIT_FLAG(7),
+        BGC_CARRY_RELATED_R = BIT_FLAG(8),
+        BGC_OBJBG_CARRY_RELATED_L = BIT_FLAG(9),
+        BGC_OBJBG_CARRY_RELATED_R = BIT_FLAG(10),
+        BGC_11 = BIT_FLAG(11),
+        BGC_12 = BIT_FLAG(12),
+        BGC_13 = BIT_FLAG(13),
+        BGC_14 = BIT_FLAG(14),
+        BGC_15 = BIT_FLAG(15),
+        BGC_16 = BIT_FLAG(16),
+        BGC_17 = BIT_FLAG(17),
+        BGC_WATER_BUBBLE = BIT_FLAG(18),
+        BGC_SIDE_LIMIT_L = BIT_FLAG(19),
+        BGC_SIDE_LIMIT_R = BIT_FLAG(20),
+        BGC_21 = BIT_FLAG(21),
+        BGC_ON_SNOW = BIT_FLAG(22),
+        BGC_ON_ICE = BIT_FLAG(23),
+        BGC_ON_ICE_LOW_SLIP = BIT_FLAG(24),
+        BGC_25 = BIT_FLAG(25),
+        BGC_ON_SAND = BIT_FLAG(26),
+        BGC_ON_SINK_SAND = BIT_FLAG(27),
+        BGC_IN_SINK_SAND = BIT_FLAG(28),
+        BGC_INSIDE_SINK_SAND = BIT_FLAG(29),
+        BGC_ON_BELT_L = BIT_FLAG(30),
+        BGC_ON_BELT_R = BIT_FLAG(31)
+    };
+
+    /// @unofficial
+    enum BgCross2_e {
+        BGC_32 = BIT_FLAG(0),
+        BGC_IS_LIFT = BIT_FLAG(1),
+        BGC_34 = BIT_FLAG(2),
+        BGC_IS_SLIP = BIT_FLAG(3),
+        BGC_36 = BIT_FLAG(4),
+        BGC_37 = BIT_FLAG(5),
+        BGC_38 = BIT_FLAG(6),
+        BGC_IS_SAKA = BIT_FLAG(7),
+        BGC_40 = BIT_FLAG(8),
+        BGC_41 = BIT_FLAG(9),
+        BGC_42 = BIT_FLAG(10),
+        BGC_51 = BIT_FLAG(19),
+        BGC_52 = BIT_FLAG(20),
+        BGC_53 = BIT_FLAG(21),
+        BGC_54 = BIT_FLAG(22),
+        BGC_55 = BIT_FLAG(23),
+        BGC_56 = BIT_FLAG(24),
+        BGC_57 = BIT_FLAG(25),
+        BGC_58 = BIT_FLAG(26),
+        BGC_59 = BIT_FLAG(27),
+        BGC_60 = BIT_FLAG(28),
+        BGC_61 = BIT_FLAG(29),
+        BGC_62 = BIT_FLAG(30),
+        BGC_63 = BIT_FLAG(31)
+    };
+
+    /// @unofficial
     enum Status_e {
         STATUS_01 = 0x01,
         STATUS_02 = 0x02,
@@ -932,34 +998,9 @@ class daPlBase_c : public dActor_c {
         mStateMgr.getOldStateID();
     }
 
-    bool checkD40Status(int bit) const {
-        if (m_d40 & (1 << bit)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     float get_1064() const { return m_1064; }
     float get_106c() const { return m_106c; }
 
-
-    bool checkD44Status(int bit) const {
-        if (m_d44 & (1 << bit)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    void setD40Status(int bit) {
-        m_d40 |= (1 << bit);
-    }
-
-    void setD44Status(int bit) {
-        m_d44 |= (1 << bit);
-    }
-
     void setStatus(int);
     void calcTimerProc();
     dPyMdlBase_c *getModel();
@@ -987,6 +1028,20 @@ class daPlBase_c : public dActor_c {
 
     int getTreadCount() { return mTreadCount; }
 
+    u32 isNowBgCross(BgCross1_e m) { return mNowBgCross1 & m; }
+    u32 isNowBgCross(BgCross2_e m) { return mNowBgCross2 & m; }
+    void onNowBgCross(BgCross1_e m) { mNowBgCross1 |= m; }
+    void onNowBgCross(BgCross2_e m) { mNowBgCross2 |= m; }
+    void offNowBgCross(BgCross1_e m) { mNowBgCross1 &= ~m; }
+    void offNowBgCross(BgCross2_e m) { mNowBgCross2 &= ~m; }
+
+    u32 isOldBgCross(BgCross1_e m) { return mOldBgCross1 & m; }
+    u32 isOldBgCross(BgCross2_e m) { return mOldBgCross2 & m; }
+    void onOldBgCross(BgCross1_e m) { mOldBgCross1 |= m; }
+    void onOldBgCross(BgCross2_e m) { mOldBgCross2 |= m; }
+    void offOldBgCross(BgCross1_e m) { mOldBgCross1 &= ~m; }
+    void offOldBgCross(BgCross2_e m) { mOldBgCross2 &= ~m; }
+
     int m_00;
     int m_04;
     float m_08;
@@ -1083,10 +1138,10 @@ class daPlBase_c : public dActor_c {
     int m_d2c;
     mVec3_c m_d30;
     float m_d3c;
-    u32 m_d40;
-    u32 m_d44;
-    u32 m_d48;
-    u32 m_d4c;
+    u32 mNowBgCross1;
+    u32 mNowBgCross2;
+    u32 mOldBgCross1;
+    u32 mOldBgCross2;
     u32 mBgCrossHistory[10];
     u32 m_d78;
     u32 m_d7c;