diff --git a/rsc/scripts/setup_server.lua b/rsc/scripts/setup_server.lua index 52566ae..02f5059 100644 --- a/rsc/scripts/setup_server.lua +++ b/rsc/scripts/setup_server.lua @@ -15,10 +15,7 @@ roomManagerAPI.SetOnCreate(function(room, index) roomAPI.SetOnTick(room, function(room) roomAPI.ForEachCharacter(room, function(character) - --testing the metatables - local meta = getmetatable(character) - print("", "userdata metatable: ", meta) - print(character["trying"]) + -- end) end) end) @@ -36,14 +33,4 @@ roomAPI.Initialize(underworld, mapSaver.Load, mapSaver.Save, mapMaker.DebugGrass --call the monstrosity doorUtility.createDoorPair("pair 1", overworld, 0, -64, underworld, 0, 0) ---testing the metatables -print("debug") -overworld["key"] = "value" -local key = overworld["key"] -print("", "result: ", key) - -local key = underworld["key"] -print("", "result: ", key) ---end test - print("Finished the lua script") diff --git a/server/network_api.cpp b/server/server_utilities/network_api.cpp similarity index 100% rename from server/network_api.cpp rename to server/server_utilities/network_api.cpp diff --git a/server/network_api.hpp b/server/server_utilities/network_api.hpp similarity index 100% rename from server/network_api.hpp rename to server/server_utilities/network_api.hpp diff --git a/server/userdata.cpp b/server/server_utilities/userdata.cpp similarity index 93% rename from server/userdata.cpp rename to server/server_utilities/userdata.cpp index 94029fd..8890fd8 100644 --- a/server/userdata.cpp +++ b/server/server_utilities/userdata.cpp @@ -21,13 +21,9 @@ */ #include "userdata.hpp" -#include - #define METAMETA "__metameta" static int index(lua_State* L) { - std::cout << "debug: index" << std::endl; - //get __metameta lua_getmetatable(L, 1); //get the userdata metatable lua_pushstring(L, METAMETA); //push the __metameta name @@ -39,7 +35,6 @@ static int index(lua_State* L) { //table doesn't exist yet if (lua_isnil(L, -1)) { - std::cout << "debug: index (no table)" << std::endl; return 1; } @@ -52,8 +47,6 @@ static int index(lua_State* L) { } static int newindex(lua_State* L) { - std::cout << "debug: newindex" << std::endl; - //get __metameta lua_getmetatable(L, 1); //get the userdata metatable lua_pushstring(L, METAMETA); //push the __metameta name @@ -65,7 +58,6 @@ static int newindex(lua_State* L) { //if this table doesn't exist yet if (lua_isnil(L, -1)) { - std::cout << "debug: newindex (new table)" << std::endl; lua_pop(L, 1); //pop nil lua_pushvalue(L, 1); //copy userdata (key) diff --git a/server/userdata.hpp b/server/server_utilities/userdata.hpp similarity index 100% rename from server/userdata.hpp rename to server/server_utilities/userdata.hpp