LuaMenu: load LuaSocket socket.lua from the base VFS

rts/Lua/LuaHandle.cpp

@@ -41,6 +41,8 @@
 #include "Sim/Units/UnitDef.h"
 #include "Sim/Weapons/Weapon.h"
 #include "Sim/Weapons/WeaponDef.h"
+#include "System/FileSystem/FileHandler.h"
+#include "System/FileSystem/VFSModes.h"
 #include "System/creg/SerializeLuaState.h"
 #include "System/Config/ConfigHandler.h"
 #include "System/EventHandler.h"
@@ -56,6 +58,8 @@
 
 #include "LuaInclude.h"
 
+#include "lib/luasocket/src/luasocket.h"
+
 #include <SDL_keyboard.h>
 #include <SDL_keycode.h>
 #include <SDL_mouse.h>
@@ -549,6 +553,28 @@ bool CLuaHandle::LoadCode(lua_State* L, std::string code, const string& debug)
 }
 
 
+void CLuaHandle::InitLuaSocket(lua_State* L)
+{
+	RECOIL_DETAILED_TRACY_ZONE;
+
+	const std::string filename = "LuaSocket/socket.lua";
+	CFileHandler f(filename, SPRING_VFS_BASE);
+	if (!f.FileExists()) {
+		LOG_L(L_ERROR, "Error loading %s (file does not exist)", filename.c_str());
+		return;
+	}
+
+	LUA_OPEN_LIB(L, luaopen_socket_core);
+
+	std::string code;
+	if (f.LoadStringData(code)) {
+		LoadCode(L, std::move(code), filename);
+	} else {
+		LOG_L(L_ERROR, "Error loading %s", filename.c_str());
+	}
+}
+
+
 int CLuaHandle::LoadStringData(lua_State* L)
 {
 	RECOIL_DETAILED_TRACY_ZONE;

rts/Lua/LuaHandle.h

@@ -329,6 +329,7 @@ class CLuaHandle : public CEventClient
 		bool AddBasicCalls(lua_State* L);
 		bool AddCommonModules(lua_State* L);
 		bool LoadCode(lua_State* L, std::string code, const std::string& debug);
+		void InitLuaSocket(lua_State* L);
 		static bool AddEntriesToTable(lua_State* L, const char* name, bool (*entriesFunc)(lua_State*));
 
 		/// returns error code and sets traceback on error

rts/Lua/LuaMenu.cpp

@@ -24,7 +24,6 @@
 #include "System/FileSystem/FileHandler.h"
 #include "System/FileSystem/FileSystem.h"
 #include "System/Threading/SpringThreading.h"
-#include "lib/luasocket/src/luasocket.h"
 #include "LuaUI.h"
 
 #include "System/Misc/TracyDefs.h"
@@ -134,22 +133,6 @@ string CLuaMenu::LoadFile(const string& name) const
 }
 
 
-void CLuaMenu::InitLuaSocket(lua_State* L) {
-	RECOIL_DETAILED_TRACY_ZONE;
-	std::string code;
-	std::string filename = "socket.lua";
-	CFileHandler f(filename);
-
-	LUA_OPEN_LIB(L, luaopen_socket_core);
-
-	if (f.LoadStringData(code)) {
-		LoadCode(L, std::move(code), filename);
-	} else {
-		LOG_L(L_ERROR, "Error loading %s", filename.c_str());
-	}
-}
-
-
 bool CLuaMenu::RemoveSomeOpenGLFunctions(lua_State* L)
 {
 	// remove some spring opengl functions that don't work preloading

rts/Lua/LuaMenu.h

@@ -61,7 +61,6 @@ class CLuaMenu : public CLuaHandle
 	static bool LoadUnsyncedReadFunctions(lua_State* L);
 	static bool RemoveSomeOpenGLFunctions(lua_State* L);
 	static bool PushGameVersion(lua_State* L);
-	void InitLuaSocket(lua_State* L);
 protected:
 	QueuedAction queuedAction;
 };

rts/Lua/LuaUI.cpp

@@ -40,7 +40,6 @@
 #include "System/Config/ConfigHandler.h"
 #include "System/StringUtil.h"
 #include "System/Threading/SpringThreading.h"
-#include "lib/luasocket/src/luasocket.h"
 
 #include <cctype>
 
@@ -207,25 +206,6 @@ GetWatchDef(Explosion)
 SetWatchDef(Explosion)
 
 
-void CLuaUI::InitLuaSocket(lua_State* L) {
-	std::string code;
-	std::string filename = "LuaSocket/socket.lua";
-	CFileHandler f(filename, SPRING_VFS_BASE);
-
-	if (!f.FileExists()) {
-		LOG_L(L_ERROR, "Error loading %s (file does not exist)", filename.c_str());
-		return;
-	}
-
-	LUA_OPEN_LIB(L, luaopen_socket_core);
-
-	if (f.LoadStringData(code)) {
-		LoadCode(L, std::move(code), filename);
-	} else {
-		LOG_L(L_ERROR, "Error loading %s", filename.c_str());
-	}
-}
-
 string CLuaUI::LoadFile(const string& name, const std::string& mode) const
 {
 	CFileHandler f(name, mode);

rts/Lua/LuaUI.h

@@ -83,7 +83,6 @@ class CLuaUI : public CLuaHandle
 	string LoadFile(const string& name, const std::string& mode) const;
 
 	bool LoadCFunctions(lua_State* L);
-	void InitLuaSocket(lua_State* L);
 
 	bool BuildCmdDescTable(lua_State* L, const vector<SCommandDescription>& cmds);
 	bool GetLuaIntMap(lua_State* L, int index, spring::unordered_map<int, int>& intList);