1 files changed, 7 insertions, 5 deletions

diff --git a/src/lua.c b/src/lua.c
index ef3c032..e138f77 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -374,19 +374,21 @@ int env_table(lua_State* L, int provide_table){
   return 1;

 }

 

-//top table is prioritized

-void luaI_jointable(lua_State* L){

-  int idx = lua_gettop(L) - 1;

+//main is the default values, merge is the new and overridden ones

+void luaI_jointable(lua_State* L, int main, int merge){

+  int idx = lua_gettop(L);

+

+  lua_pushvalue(L, merge);

 

   lua_pushnil(L);

   for(;lua_next(L, -2) != 0;){

     lua_pushvalue(L, -2);

     lua_pushvalue(L, -2);

-    lua_settable(L, idx);

+    lua_settable(L, main);

     lua_pop(L, 1);

   }

 

-  lua_pushvalue(L, idx);

+  lua_settop(L, idx);

 }

 

 //copys all variables from state A to B, including locals (stored in _locals)