lsteamclient: Fixup paths for GetGlyph*() also in SteamInput006.

3 files changed, 34 insertions, 20 deletions

diff --git a/lsteamclient/cppISteamInput_SteamInput006.cpp b/lsteamclient/cppISteamInput_SteamInput006.cpp
index bd8f8477..e07c1735 100644
--- a/lsteamclient/cppISteamInput_SteamInput006.cpp
+++ b/lsteamclient/cppISteamInput_SteamInput006.cpp
@@ -126,21 +126,6 @@ int cppISteamInput_SteamInput006_GetAnalogActionOrigins(void *linux_side, InputH
     return ((ISteamInput*)linux_side)->GetAnalogActionOrigins((InputHandle_t)inputHandle, (InputActionSetHandle_t)actionSetHandle, (InputAnalogActionHandle_t)analogActionHandle, (EInputActionOrigin *)originsOut);
 }
 
-const char * cppISteamInput_SteamInput006_GetGlyphPNGForActionOrigin(void *linux_side, EInputActionOrigin eOrigin, ESteamInputGlyphSize eSize, uint32 unFlags)
-{
-    return ((ISteamInput*)linux_side)->GetGlyphPNGForActionOrigin((EInputActionOrigin)eOrigin, (ESteamInputGlyphSize)eSize, (uint32)unFlags);
-}
-
-const char * cppISteamInput_SteamInput006_GetGlyphSVGForActionOrigin(void *linux_side, EInputActionOrigin eOrigin, uint32 unFlags)
-{
-    return ((ISteamInput*)linux_side)->GetGlyphSVGForActionOrigin((EInputActionOrigin)eOrigin, (uint32)unFlags);
-}
-
-const char * cppISteamInput_SteamInput006_GetGlyphForActionOrigin_Legacy(void *linux_side, EInputActionOrigin eOrigin)
-{
-    return ((ISteamInput*)linux_side)->GetGlyphForActionOrigin_Legacy((EInputActionOrigin)eOrigin);
-}
-
 const char * cppISteamInput_SteamInput006_GetStringForActionOrigin(void *linux_side, EInputActionOrigin eOrigin)
 {
     return ((ISteamInput*)linux_side)->GetStringForActionOrigin((EInputActionOrigin)eOrigin);
@@ -216,11 +201,6 @@ const char * cppISteamInput_SteamInput006_GetStringForXboxOrigin(void *linux_sid
     return ((ISteamInput*)linux_side)->GetStringForXboxOrigin((EXboxOrigin)eOrigin);
 }
 
-const char * cppISteamInput_SteamInput006_GetGlyphForXboxOrigin(void *linux_side, EXboxOrigin eOrigin)
-{
-    return ((ISteamInput*)linux_side)->GetGlyphForXboxOrigin((EXboxOrigin)eOrigin);
-}
-
 EInputActionOrigin cppISteamInput_SteamInput006_GetActionOriginFromXboxOrigin(void *linux_side, InputHandle_t inputHandle, EXboxOrigin eOrigin)
 {
     return ((ISteamInput*)linux_side)->GetActionOriginFromXboxOrigin((InputHandle_t)inputHandle, (EXboxOrigin)eOrigin);
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 604b0c20..6671135d 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -248,6 +248,12 @@ manually_handled_methods = {
             "GetGlyphForActionOrigin_Legacy",
             "GetGlyphForXboxOrigin"
         ],
+        "cppISteamInput_SteamInput006": [
+            "GetGlyphPNGForActionOrigin",
+            "GetGlyphSVGForActionOrigin",
+            "GetGlyphForActionOrigin_Legacy",
+            "GetGlyphForXboxOrigin"
+        ],
         "cppISteamController_SteamController005": [
             "GetGlyphForActionOrigin"
         ],
diff --git a/lsteamclient/steamclient_manual_153a.cpp b/lsteamclient/steamclient_manual_153a.cpp
index 0c880124..79d0b775 100644
--- a/lsteamclient/steamclient_manual_153a.cpp
+++ b/lsteamclient/steamclient_manual_153a.cpp
@@ -322,4 +322,32 @@ SteamNetworkingMessage_t *cppISteamNetworkingUtils_SteamNetworkingUtils004_Alloc
     return (SteamNetworkingMessage_t*)&msg->win_msg;
 }
 
+const char * cppISteamInput_SteamInput006_GetGlyphPNGForActionOrigin(void *linux_side, EInputActionOrigin eOrigin, ESteamInputGlyphSize eSize, uint32 unFlags)
+{
+    const char *path_result;
+    path_result = ((ISteamInput*)linux_side)->GetGlyphPNGForActionOrigin((EInputActionOrigin)eOrigin, eSize, unFlags);
+    return steamclient_isteaminput_getglyph_png(eOrigin, eSize, unFlags, path_result);
+}
+
+const char * cppISteamInput_SteamInput006_GetGlyphSVGForActionOrigin(void *linux_side, EInputActionOrigin eOrigin, uint32 unFlags)
+{
+    const char *path_result;
+    path_result = ((ISteamInput*)linux_side)->GetGlyphSVGForActionOrigin((EInputActionOrigin)eOrigin, unFlags);
+    return steamclient_isteaminput_getglyph_svg(eOrigin, unFlags, path_result);
+}
+
+const char * cppISteamInput_SteamInput006_GetGlyphForActionOrigin_Legacy(void *linux_side, EInputActionOrigin eOrigin)
+{
+    const char *path_result;
+    path_result = ((ISteamInput*)linux_side)->GetGlyphForActionOrigin_Legacy((EInputActionOrigin)eOrigin);
+    return steamclient_isteaminput_getglyph(eOrigin, path_result);
+}
+
+const char * cppISteamInput_SteamInput006_GetGlyphForXboxOrigin(void *linux_side, EXboxOrigin eOrigin)
+{
+    const char *path_result;
+    path_result = ((ISteamInput*)linux_side)->GetGlyphForXboxOrigin((EXboxOrigin)eOrigin);
+    return steamclient_isteaminput_getglyph_xbox(eOrigin, path_result);
+}
+
 }