Functions "IsDevMode" and "IsUjAPI" were added. All external functions were moved in one section.

Author: Ev3nt

README.md

@@ -1,4 +1,4 @@
-# War3 Lua - 1.3.7 (<span style="color: #53377A">Blight</span>)
+# War3 Lua - 1.3.8 (<span style="color: #53377A">Blight</span>)
 
 [![lua](https://img.shields.io/badge/lua-v5.4.4-blue)](https://www.lua.org)
 ![warcraft](https://img.shields.io/badge/warcraft-1.24e/1.26a/1.27a/1.27b/1.28f-darkgreen)

Resource.rc

@@ -16,6 +16,8 @@ bool StartUp();
 BOOL APIENTRY DllMain(HMODULE module, UINT reason, LPVOID reserved) {
 	switch (reason) {
 	case DLL_PROCESS_ATTACH:
+		DisableThreadLibraryCalls(module);
+
 		if (!gameBase) {
 			return FALSE;
 		}

Src/DllMain.cpp

@@ -431,45 +431,6 @@ namespace LuaFunctions {
 		return 1;
 	}
 
-	int IdToString(lua_State* l) {
-		if (lua_isinteger(l, 1)) {
-			DWORD id = (DWORD)lua_tointeger(l, 1);
-			std::reverse(&(((LPSTR)&id)[0]), &(((LPSTR)&id)[4]));
-			lua_pushlstring(l, (LPSTR)&id, 4);
-		}
-		else {
-			return luaL_typeerror(l, 1, "integer");
-		}
-
-
-		return 1;
-	}
-
-	int StringToId(lua_State* l) {
-		if (lua_isstring(l, 1)) {
-			lua_pushinteger(l, Jass::ToID(lua_tostring(l, 1)));
-		}
-		else {
-			return luaL_typeerror(l, 1, "string");
-		}
-
-		return 1;
-	}
-
-	int FourCC(lua_State* l) {
-		if (lua_isinteger(l, 1)) {
-			IdToString(l);
-		}
-		else if (lua_isstring(l, 1)) {
-			StringToId(l);
-		}
-		else {
-			return luaL_typeerror(l, 1, "string or integer");
-		}
-
-		return 1;
-	}
-
 	int lua_jassoplistgc(lua_State* l) {
 		lua_getfield(l, 1, "oplist");
 		delete (JassMachine::JASS_OPLIST*)lua_touserdata(l, -1);
@@ -527,11 +488,7 @@ namespace LuaFunctions {
 
 		for (auto& native : Jass::jassnatives) {
 			lua_registerJassNative(l, native.first.data(), &native.second, lua_invokeNative);
-		}
-
-		lua_register(l, "IdToString", IdToString);
-		lua_register(l, "StringToId", StringToId);
-		lua_register(l, "FourCC", FourCC);		
+		}	
 	}
 
 	int lua_getJassArrayElement(lua_State* l) {
@@ -720,6 +677,45 @@ namespace LuaFunctions {
 
 	//--------------------------------------------------------
 
+	int lua_IdToString(lua_State* l) {
+		if (lua_isinteger(l, 1)) {
+			DWORD id = (DWORD)lua_tointeger(l, 1);
+			std::reverse(&(((LPSTR)&id)[0]), &(((LPSTR)&id)[4]));
+			lua_pushlstring(l, (LPSTR)&id, 4);
+		}
+		else {
+			return luaL_typeerror(l, 1, "integer");
+		}
+
+
+		return 1;
+	}
+
+	int lua_StringToId(lua_State* l) {
+		if (lua_isstring(l, 1)) {
+			lua_pushinteger(l, Jass::ToID(lua_tostring(l, 1)));
+		}
+		else {
+			return luaL_typeerror(l, 1, "string");
+		}
+
+		return 1;
+	}
+
+	int lua_FourCC(lua_State* l) {
+		if (lua_isinteger(l, 1)) {
+			lua_IdToString(l);
+		}
+		else if (lua_isstring(l, 1)) {
+			lua_StringToId(l);
+		}
+		else {
+			return luaL_typeerror(l, 1, "string or integer");
+		}
+
+		return 1;
+	}
+
 	int lua_GetMapFileName(lua_State* l) {
 		if (lua_isboolean(l, 1)) {
 			Storm::Archive map;
@@ -740,7 +736,26 @@ namespace LuaFunctions {
 		return 1;
 	}
 
+	int lua_IsDevMode(lua_State* l) {
+		lua_pushboolean(l, developerMode);
+
+		return 1;
+	}
+
+	int lua_IsUjAPI(lua_State* l) {
+		lua_pushboolean(l, isUjAPI);
+
+		return 1;
+	}
+
 	void lua_openExternalFunctions(lua_State* l) {
+		lua_register(l, "IdToString", lua_IdToString);
+		lua_register(l, "StringToId", lua_StringToId);
+		lua_register(l, "FourCC", lua_FourCC);
+
 		lua_register(l, "GetMapFileName", lua_GetMapFileName);
+
+		lua_register(l, "IsDevMode", lua_IsDevMode);
+		lua_register(l, "IsUjAPI", lua_IsUjAPI);
 	}
 }

Src/LuaFunctions.cpp

@@ -20,7 +20,7 @@
 
 #define WAR3_LUA_MAJOR "1"
 #define WAR3_LUA_MINOR "3"
-#define WAR3_LUA_RELEASE "7"
+#define WAR3_LUA_RELEASE "8"
 #define WAR3_LUA_VERSION_NAME  WAR3_LUA_VERSION_COLOR "Blight" WAR3_LUA_VERSION_COLOR_RESET
 
 #define WAR3_LUA_VERSION WAR3_LUA_MAJOR "." WAR3_LUA_MINOR "." WAR3_LUA_RELEASE