Changeset 1161 for Daodan/src/Oni

Timestamp:

Oct 24, 2021, 4:50:22 AM (3 years ago)

Author:

rossy

Message:

Daodan: Use uint64_t for Oni's action state

File:

• Daodan/src/Oni/GameState.h (modified) (2 diffs)

Daodan/src/Oni/GameState.h

@@ -305 +305 @@
         Action_PlayRecord                = 0x1000,
         Action_F12                       = 0x2000,
-        Action_Unknown1                  = 0x4000,
         Action_LookMode                  = 0x8000,
         Action_Screenshot                = 0x10000,
-        Action_Unknown2                  = 0x20000,
-        Action_Unknown3                  = 0x40000,
-        Action_Unknown4                  = 0x80000,
-        Action_Unknown5                  = 0x100000,
         Action_Forward                   = 0x200000,
         Action_Backward                  = 0x400000,
@@ -323 +318 @@
         Action_Kick                      = 0x40000000,
         Action_Block                     = 0x80000000,
-        //used in second action field
-        Action2_Walk                     = 1,
-        Action2_Action                   = 2,
-        Action2_Hypo                     = 4,
-        Action2_Reload                   = 8,
-        Action2_Swap                     = 0x10,
-        Action2_Drop                     = 0x20,
-        Action2_Fire1                    = 0x40,
-        Action2_Fire2                    = 0x80,
-        Action2_Fire3                    = 0x100,
+        Action_Walk                      = 0x100000000ull,
+        Action_Action                    = 0x200000000ull,
+        Action_Hypo                      = 0x400000000ull,
+        Action_Reload                    = 0x800000000ull,
+        Action_Swap                      = 0x1000000000ull,
+        Action_Drop                      = 0x2000000000ull,
+        Action_Fire1                     = 0x4000000000ull,
+        Action_Fire2                     = 0x8000000000ull,
+        Action_Fire3                     = 0x10000000000ull,
 };
-
-
-typedef struct {
-        int32_t Actions1;
-        int32_t Actions2;
-} InputAction;
-
 
 typedef struct {
         float MouseDeltaX;
         float MouseDeltaY;
-        float field_8;
-        float field_C;
-        InputAction Current;
-        InputAction Stopped;
-        InputAction Start;
-        InputAction Stop;
+        float unknown1;
+        int unknown2;
+        uint64_t ActionsDown;
+        uint64_t ActionsUp;
+        uint64_t ActionsPressed;
+        uint64_t ActionsReleased;
 } GameInput;