Merge branch 'praydog:master' into master

joeyhodge · web-flow · commit 340f7b1b2967 · 2025-04-27T09:21:41.000-04:00
diff --git a/dependencies/lua/src/ldebug.c b/dependencies/lua/src/ldebug.c
@@ -783,8 +783,11 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
   va_start(argp, fmt);
   msg = luaO_pushvfstring(L, fmt, argp);  /* format message */
   va_end(argp);
-  if (isLua(ci))  /* if Lua function, add source:line information */
+  if (isLua(ci)) {  /* if Lua function, add source:line information */
     luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci));
+    setobjs2s(L, L->top - 2, L->top - 1);  /* remove 'msg' from the stack */
+    L->top--;
+  }
   luaG_errormsg(L);
 }
 
diff --git a/dependencies/lua/src/lvm.c b/dependencies/lua/src/lvm.c
@@ -656,8 +656,10 @@ void luaV_concat (lua_State *L, int total) {
       /* collect total length and number of strings */
       for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {
         size_t l = vslen(s2v(top - n - 1));
-        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl))
+        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {
+          L->top = top - total;  /* pop strings to avoid wasting stack */
           luaG_runerror(L, "string length overflow");
+        }
         tl += l;
       }
       if (tl <= LUAI_MAXSHORTLEN) {  /* is result a short string? */
@@ -672,7 +674,7 @@ void luaV_concat (lua_State *L, int total) {
       setsvalue2s(L, top - n, ts);  /* create result */
     }
     total -= n-1;  /* got 'n' strings to create 1 new */
-    L->top -= n-1;  /* popped 'n' strings and pushed one */
+    L->top = top - (n - 1);  /* popped 'n' strings and pushed one */
   } while (total > 1);  /* repeat until only 1 result left */
 }
 
diff --git a/include/reframework/API.h b/include/reframework/API.h
@@ -7,7 +7,7 @@
 #endif
 
 #define REFRAMEWORK_PLUGIN_VERSION_MAJOR 1
-#define REFRAMEWORK_PLUGIN_VERSION_MINOR 14
+#define REFRAMEWORK_PLUGIN_VERSION_MINOR 15
 #define REFRAMEWORK_PLUGIN_VERSION_PATCH 0
 
 #define REFRAMEWORK_RENDERER_D3D11 0
diff --git a/include/reframework/API.hpp b/include/reframework/API.hpp
@@ -609,8 +609,12 @@ class API {
         reframework::InvokeRet invoke(API::ManagedObject* obj, const std::vector<void*>& args) {
             static const auto fn = API::s_instance->sdk()->method->invoke;
             reframework::InvokeRet out{};
-
-            auto result = fn(*this, obj, (void**)&args[0], args.size() * sizeof(void*), &out, sizeof(out));
+            REFrameworkResult result;
+            if (args.size() == 0) {
+                result = fn(*this, obj, nullptr, 0, &out, sizeof(out));
+            } else {
+                result = fn(*this, obj, (void**)&args[0], args.size() * sizeof(void*), &out, sizeof(out));
+            }
 
 #ifdef REFRAMEWORK_API_EXCEPTIONS
             if (result != REFRAMEWORK_ERROR_NONE) {
diff --git a/src/mods/bindings/ImGui.cpp b/src/mods/bindings/ImGui.cpp
@@ -2238,6 +2238,171 @@ void bindings::open_imgui(ScriptState* s) {
         "IsHovered", ImGuiTableColumnFlags_IsHovered           
     );
 
+    imgui.new_enum("ImGuiKey",
+        
+        // Keys
+        "Key_None", ImGuiKey_None,
+        "Key_Tab", ImGuiKey_Tab,
+        "Key_LeftArrow", ImGuiKey_LeftArrow,
+        "Key_RightArrow", ImGuiKey_RightArrow,
+        "Key_UpArrow", ImGuiKey_UpArrow,
+        "Key_DownArrow", ImGuiKey_DownArrow,
+        "Key_PageUp", ImGuiKey_PageUp,
+        "Key_PageDown", ImGuiKey_PageDown,
+        "Key_Home", ImGuiKey_Home,
+        "Key_End", ImGuiKey_End,
+        "Key_Insert", ImGuiKey_Insert,
+        "Key_Delete", ImGuiKey_Delete,
+        "Key_Backspace", ImGuiKey_Backspace,
+        "Key_Space", ImGuiKey_Space,
+        "Key_Enter", ImGuiKey_Enter,
+        "Key_Escape", ImGuiKey_Escape,
+        "Key_LeftCtrl", ImGuiKey_LeftCtrl,
+        "Key_LeftShift", ImGuiKey_LeftShift,
+        "Key_LeftAlt", ImGuiKey_LeftAlt,
+        "Key_LeftSuper", ImGuiKey_LeftSuper,
+        "Key_RightCtrl", ImGuiKey_RightCtrl,
+        "Key_RightShift", ImGuiKey_RightShift,
+        "Key_RightAlt", ImGuiKey_RightAlt,
+        "Key_RightSuper", ImGuiKey_RightSuper,
+        "Key_Menu", ImGuiKey_Menu,
+        "Key_0", ImGuiKey_0,
+        "Key_1", ImGuiKey_1,
+        "Key_2", ImGuiKey_2,
+        "Key_3", ImGuiKey_3,
+        "Key_4", ImGuiKey_4,
+        "Key_5", ImGuiKey_5,
+        "Key_6", ImGuiKey_6,
+        "Key_7", ImGuiKey_7,
+        "Key_8", ImGuiKey_8,
+        "Key_9", ImGuiKey_9,
+        "Key_A", ImGuiKey_A,
+        "Key_B", ImGuiKey_B,
+        "Key_C", ImGuiKey_C,
+        "Key_D", ImGuiKey_D,
+        "Key_E", ImGuiKey_E,
+        "Key_F", ImGuiKey_F,
+        "Key_G", ImGuiKey_G,
+        "Key_H", ImGuiKey_H,
+        "Key_I", ImGuiKey_I,
+        "Key_J", ImGuiKey_J,
+        "Key_K", ImGuiKey_K,
+        "Key_L", ImGuiKey_L,
+        "Key_M", ImGuiKey_M,
+        "Key_N", ImGuiKey_N,
+        "Key_O", ImGuiKey_O,
+        "Key_P", ImGuiKey_P,
+        "Key_Q", ImGuiKey_Q,
+        "Key_R", ImGuiKey_R,
+        "Key_S", ImGuiKey_S,
+        "Key_T", ImGuiKey_T,
+        "Key_U", ImGuiKey_U,
+        "Key_V", ImGuiKey_V,
+        "Key_W", ImGuiKey_W,
+        "Key_X", ImGuiKey_X,
+        "Key_Y", ImGuiKey_Y,
+        "Key_Z", ImGuiKey_Z,
+        "Key_F1", ImGuiKey_F1,
+        "Key_F2", ImGuiKey_F2,
+        "Key_F3", ImGuiKey_F3,
+        "Key_F4", ImGuiKey_F4,
+        "Key_F5", ImGuiKey_F5,
+        "Key_F6", ImGuiKey_F6,
+        "Key_F7", ImGuiKey_F7,
+        "Key_F8", ImGuiKey_F8,
+        "Key_F9", ImGuiKey_F9,
+        "Key_F10", ImGuiKey_F10,
+        "Key_F11", ImGuiKey_F11,
+        "Key_F12", ImGuiKey_F12,
+        "Key_F13", ImGuiKey_F13,
+        "Key_F14", ImGuiKey_F14,
+        "Key_F15", ImGuiKey_F15,
+        "Key_F16", ImGuiKey_F16,
+        "Key_F17", ImGuiKey_F17,
+        "Key_F18", ImGuiKey_F18,
+        "Key_F19", ImGuiKey_F19,
+        "Key_F20", ImGuiKey_F20,
+        "Key_F21", ImGuiKey_F21,
+        "Key_F22", ImGuiKey_F22,
+        "Key_F23", ImGuiKey_F23,
+        "Key_F24", ImGuiKey_F24,
+        "Key_Apostrophe", ImGuiKey_Apostrophe,
+        "Key_Comma", ImGuiKey_Comma,
+        "Key_Minus", ImGuiKey_Minus,
+        "Key_Period", ImGuiKey_Period,
+        "Key_Slash", ImGuiKey_Slash,
+        "Key_Semicolon", ImGuiKey_Semicolon,
+        "Key_Equal", ImGuiKey_Equal,
+        "Key_LeftBracket", ImGuiKey_LeftBracket,
+        "Key_Backslash", ImGuiKey_Backslash,
+        "Key_RightBracket", ImGuiKey_RightBracket,
+        "Key_GraveAccent", ImGuiKey_GraveAccent,
+        "Key_CapsLock", ImGuiKey_CapsLock,
+        "Key_ScrollLock", ImGuiKey_ScrollLock,
+        "Key_NumLock", ImGuiKey_NumLock,
+        "Key_PrintScreen", ImGuiKey_PrintScreen,
+        "Key_Pause", ImGuiKey_Pause,
+        "Key_Keypad0", ImGuiKey_Keypad0,
+        "Key_Keypad1", ImGuiKey_Keypad1,
+        "Key_Keypad2", ImGuiKey_Keypad2,
+        "Key_Keypad3", ImGuiKey_Keypad3,
+        "Key_Keypad4", ImGuiKey_Keypad4,
+        "Key_Keypad5", ImGuiKey_Keypad5,
+        "Key_Keypad6", ImGuiKey_Keypad6,
+        "Key_Keypad7", ImGuiKey_Keypad7,
+        "Key_Keypad8", ImGuiKey_Keypad8,
+        "Key_Keypad9", ImGuiKey_Keypad9,
+        "Key_KeypadDecimal", ImGuiKey_KeypadDecimal,
+        "Key_KeypadDivide", ImGuiKey_KeypadDivide,
+        "Key_KeypadMultiply", ImGuiKey_KeypadMultiply,
+        "Key_KeypadSubtract", ImGuiKey_KeypadSubtract,
+        "Key_KeypadAdd", ImGuiKey_KeypadAdd,
+        "Key_KeypadEnter", ImGuiKey_KeypadEnter,
+        "Key_KeypadEqual", ImGuiKey_KeypadEqual,
+        "Key_AppBack", ImGuiKey_AppBack,
+        "Key_AppForward", ImGuiKey_AppForward,
+        "Key_Oem102", ImGuiKey_Oem102,
+        "Key_GamepadStart", ImGuiKey_GamepadStart,
+        "Key_GamepadBack", ImGuiKey_GamepadBack,
+        "Key_GamepadFaceLeft", ImGuiKey_GamepadFaceLeft,
+        "Key_GamepadFaceRight", ImGuiKey_GamepadFaceRight,
+        "Key_GamepadFaceUp", ImGuiKey_GamepadFaceUp,
+        "Key_GamepadFaceDown", ImGuiKey_GamepadFaceDown,
+        "Key_GamepadDpadLeft", ImGuiKey_GamepadDpadLeft,
+        "Key_GamepadDpadRight", ImGuiKey_GamepadDpadRight,
+        "Key_GamepadDpadUp", ImGuiKey_GamepadDpadUp,
+        "Key_GamepadDpadDown", ImGuiKey_GamepadDpadDown,
+        "Key_GamepadL1", ImGuiKey_GamepadL1,
+        "Key_GamepadR1", ImGuiKey_GamepadR1,
+        "Key_GamepadL2", ImGuiKey_GamepadL2,
+        "Key_GamepadR2", ImGuiKey_GamepadR2,
+        "Key_GamepadL3", ImGuiKey_GamepadL3,
+        "Key_GamepadR3", ImGuiKey_GamepadR3,
+        "Key_GamepadLStickLeft", ImGuiKey_GamepadLStickLeft,
+        "Key_GamepadLStickRight", ImGuiKey_GamepadLStickRight,
+        "Key_GamepadLStickUp", ImGuiKey_GamepadLStickUp,
+        "Key_GamepadLStickDown", ImGuiKey_GamepadLStickDown,
+        "Key_GamepadRStickLeft", ImGuiKey_GamepadRStickLeft,
+        "Key_GamepadRStickRight", ImGuiKey_GamepadRStickRight,
+        "Key_GamepadRStickUp", ImGuiKey_GamepadRStickUp,
+        "Key_GamepadRStickDown", ImGuiKey_GamepadRStickDown,
+        "Key_MouseLeft", ImGuiKey_MouseLeft,
+        "Key_MouseRight", ImGuiKey_MouseRight,
+        "Key_MouseMiddle", ImGuiKey_MouseMiddle,
+        "Key_MouseX1", ImGuiKey_MouseX1,
+        "Key_MouseX2", ImGuiKey_MouseX2,
+        "Key_MouseWheelX", ImGuiKey_MouseWheelX,
+        "Key_MouseWheelY", ImGuiKey_MouseWheelY,
+
+        // Modifiers
+        "Mod_None", ImGuiMod_None,
+        "Mod_Ctrl", ImGuiMod_Ctrl,
+        "Mod_Shift", ImGuiMod_Shift,
+        "Mod_Alt", ImGuiMod_Alt,
+        "Mod_Super", ImGuiMod_Super,
+        "Mod_Mask_", ImGuiMod_Mask_
+    );
+
     lua["imgui"] = imgui;
 
     auto imguizmo = lua.create_table();

Original file line number	Diff line number	Diff line change
`@@ -656,8 +656,10 @@ void luaV_concat (lua_State *L, int total) {`
`656`	`656`	`/* collect total length and number of strings */`
`657`	`657`	`for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {`
`658`	`658`	`size_t l = vslen(s2v(top - n - 1));`
`659`		`- if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl))`
	`659`	`+ if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {`
	`660`	`+ L->top = top - total; /* pop strings to avoid wasting stack */`
`660`	`661`	`luaG_runerror(L, "string length overflow");`
	`662`	`+ }`
`661`	`663`	`tl += l;`
`662`	`664`	`}`
`663`	`665`	`if (tl <= LUAI_MAXSHORTLEN) { /* is result a short string? */`
`@@ -672,7 +674,7 @@ void luaV_concat (lua_State *L, int total) {`
`672`	`674`	`setsvalue2s(L, top - n, ts); /* create result */`
`673`	`675`	`}`
`674`	`676`	`total -= n-1; /* got 'n' strings to create 1 new */`
`675`		`- L->top -= n-1; /* popped 'n' strings and pushed one */`
	`677`	`+ L->top = top - (n - 1); /* popped 'n' strings and pushed one */`
`676`	`678`	`} while (total > 1); /* repeat until only 1 result left */`
`677`	`679`	`}`
`678`	`680`