2.0-stable (#136)

Author: Trey2k

README.md

@@ -4,7 +4,6 @@
   * [About](#about)
   * [Features](#features)
   * [Release Builds](#release-builds)
-  * [TODO](#todo)
   * [Compiling](#compiling)
   * [Getting Started](#getting-started)
   * [Contributing And Feature Requests](#contributing-and-feature-requests)
@@ -67,10 +66,6 @@ Release Builds
 - [🗜️ Export Templates](https://github.com/WeaselGames/godot_luaAPI/releases/latest/download/export-templates.tpz)
 - For previous versions see [releases](https://github.com/WeaselGames/godot_luaAPI/releases)
 
-TODO
------
-- Workaround for lack of CallableCustoms in GDExtension
-
 Compiling
 ------------
 This build is for godot 4.0-stable.

SConstruct

@@ -6,8 +6,9 @@ import fnmatch
 env = SConscript("external/SConscript")
 env.tools=['mingw']
 
-env.Append(CPPDEFINES 	    = ['LAPI_GDEXTENSION'])
-env.Append(CPPPATH 	        = [Dir('src').abspath, Dir('external').abspath])
+env.Append(CPPDEFINES = ['LAPI_GDEXTENSION'])
+env.Append(CPPPATH 	  = [Dir('src').abspath, Dir('external').abspath])
+
 sources = Glob('*.cpp')
 sources.append(Glob('src/*.cpp'))
 sources.append(Glob('src/classes/*.cpp'))

src/luaState.cpp

@@ -355,7 +355,8 @@ LuaError *LuaState::pushVariant(lua_State *state, Variant var) {
 				lua_pushnil(state);
 				break;
 			}
-// If the type being pushed is a lua error, Raise a error
+
+			// If the type being pushed is a lua error, Raise a error
 #ifndef LAPI_GDEXTENSION
 			if (LuaError *err = Object::cast_to<LuaError>(var.operator Object *()); err != nullptr) {
 #else
@@ -399,7 +400,7 @@ LuaError *LuaState::pushVariant(lua_State *state, Variant var) {
 			}
 #endif
 
-// If the type being pushed is a LuaCallableExtra. use mt_CallableExtra instead
+			// If the type being pushed is a LuaCallableExtra. use mt_CallableExtra instead
 #ifndef LAPI_GDEXTENSION
 			if (LuaCallableExtra *func = Object::cast_to<LuaCallableExtra>(var.operator Object *()); func != nullptr) {
 #else
@@ -893,12 +894,12 @@ void LuaState::luaHook(lua_State *state, lua_Debug *ar) {
 		return;
 	}
 
-#ifndef LAPI_GDEXTENSION
 	Array args;
 	args.append(Ref<LuaAPI>(api));
 	args.append(ar->event);
 	args.append(ar->currentline);
 
+#ifndef LAPI_GDEXTENSION
 	const int argc = 3;
 	const Variant *p_args[argc];
 	for (int i = 0; i < argc; i++) {
@@ -925,11 +926,6 @@ void LuaState::luaHook(lua_State *state, lua_Debug *ar) {
 		lua_error(state);
 	}
 #else
-	Array args;
-	args.append(Ref<LuaAPI>(api));
-	args.append(ar->event);
-	args.append(ar->currentline);
-
 	Variant returned = hook.callv(args);
 
 	LuaError *err = LuaState::pushVariant(state, returned);