add InputMapping array union

spelunky-fyi · Nov 11, 2023 · e924f88 · e924f88
1 parent 70a9142
commit e924f88
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
diff --git a/docs/src/includes/_home.md b/docs/src/includes/_home.md
@@ -162,4 +162,3 @@ uColor | int;
 SHORT_TILE_CODE | int;
 STRINGID | int;
 FEAT | int;
-KEY | int;
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
@@ -1073,6 +1073,7 @@ int | [left](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=left) |
 int | [right](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=right) | 
 int | [up](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=up) | 
 int | [down](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=down) | 
+array&lt;[RAW_KEY](#RAW_KEY), 12&gt; | [mapping](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mapping) | Can be indexed with [INPUT_FLAG](#INPUT_FLAG), keyboard uses [RAW_KEY](#RAW_KEY) values, controller just uses button numbers.
 
 ### PlayerInputs
 

diff --git a/src/game_api/aliases.hpp b/src/game_api/aliases.hpp
@@ -23,7 +23,8 @@ using WORLD_SHADER = uint8_t;                 // NoAlias
 using SHORT_TILE_CODE = uint8_t;
 using STRINGID = uint32_t;
 using FEAT = uint8_t;
-using KEY = int64_t;
+using KEY = int64_t;    // NoAlias
+using RAW_KEY = int8_t; // NoAlias
 
 inline constexpr uint8_t MAX_PLAYERS = 4;
 

diff --git a/src/game_api/script/usertypes/player_lua.cpp b/src/game_api/script/usertypes/player_lua.cpp
@@ -66,7 +66,9 @@ void register_usertypes(sol::state& lua)
         "up",
         sol::readonly(&InputMapping::up),
         "down",
-        sol::readonly(&InputMapping::down));
+        sol::readonly(&InputMapping::down),
+        "mapping",
+        sol::readonly(&InputMapping::mapping));
     /// Used in StateMemory
     lua.new_usertype<PlayerInputs>(
         "PlayerInputs",

diff --git a/src/game_api/state_structs.hpp b/src/game_api/state_structs.hpp
@@ -21,18 +21,26 @@ struct RobinHoodTableEntry
 
 struct InputMapping
 {
-    uint8_t jump;
-    uint8_t attack;
-    uint8_t bomb;
-    uint8_t rope;
-    uint8_t walk_run;
-    uint8_t use_door_buy;
-    uint8_t pause_menu;
-    uint8_t journal;
-    uint8_t left;
-    uint8_t right;
-    uint8_t up;
-    uint8_t down;
+    union
+    {
+        struct
+        {
+            int8_t jump;
+            int8_t attack;
+            int8_t bomb;
+            int8_t rope;
+            int8_t walk_run;
+            int8_t use_door_buy;
+            int8_t pause_menu;
+            int8_t journal;
+            int8_t left;
+            int8_t right;
+            int8_t up;
+            int8_t down;
+        };
+        /// Can be indexed with INPUT_FLAG, keyboard uses RAW_KEY values, controller just uses button numbers.
+        std::array<RAW_KEY, 12> mapping;
+    };
 };
 
 struct PlayerSlot