Merge branch 'master' into another

gframe/game.h

@@ -759,7 +759,9 @@ extern Game* mainGame;
 #define TEXTURE_ATTACK				5
 #define TEXTURE_ACTIVATE			6
 
+#ifndef DEFAULT_DUEL_RULE
 #define DEFAULT_DUEL_RULE			4
+#endif
 
 #define CARD_ARTWORK_VERSIONS_OFFSET	10
 #endif // GAME_H

gframe/menu_handler.cpp

@@ -543,6 +543,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						message.append(wlinebuf);
 					}
 				}
+				fclose(fp);
 				mainGame->SetStaticText(mainGame->stSinglePlayInfo, 200, mainGame->guiFont, message.c_str());
 				break;
 			}

gframe/premake4.lua

@@ -18,6 +18,8 @@ project "ygopro"
     if os.getenv("YGOPRO_COMPAT_MYCARD") then
         defines { "YGOPRO_COMPAT_MYCARD" }
     end
+    local mr=os.getenv("YGOPRO_DEFAULT_DUEL_RULE")
+    if mr and tonumber(mr) then defines { "DEFAULT_DUEL_RULE="..tonumber(mr) } end
 
     configuration "windows"
         files "ygopro.rc"

ocgcore @ 35a2d6ec

-Subproject commit 2596febe9d63caa3b01742ea9ab5f3b562f94bdc
+Subproject commit 35a2d6ecc93e7d0b681835dfc2390c6c7a50e9d2

premake5.lua

@@ -2,7 +2,7 @@ solution "ygo"
     location "build"
     language "C++"
     objdir "obj"
-    if os.ishost("windows") or os.getenv("USE_IRRKLANG") then
+    if (os.ishost("windows") or os.getenv("USE_IRRKLANG")) and not os.getenv("NO_IRRKLANG") then
         USE_IRRKLANG = true
         if os.getenv("irrklang_pro") then
             IRRKLANG_PRO = true
@@ -10,7 +10,11 @@ solution "ygo"
     end
 
     configurations { "Release", "Debug" }
+if os.getenv("YGOPRO_LUA_SAVE") then
+    defines { "LUA_COMPAT_5_2", "YGOPRO_LUA_SAFE" }
+else
     defines { "LUA_COMPAT_5_2" }
+end
     configuration "windows"
         defines { "WIN32", "_WIN32", "WINVER=0x0501" }
         libdirs { "$(DXSDK_DIR)Lib/x86" }
@@ -19,11 +23,13 @@ solution "ygo"
         systemversion "latest"
         startproject "ygopro"
 
+if not os.getenv("YGOPRO_NO_XP_TOOLSET") then
     configuration { "windows", "vs2017" }
         toolset "v141_xp"
 
     configuration { "windows", "not vs2017" }
         toolset "v140_xp"
+end
 
     configuration "bsd"
         defines { "LUA_USE_POSIX" }

script @ 27fd14e4

-Subproject commit 254990de5f328307eb5c324c28cf0aee0153ad89
+Subproject commit 27fd14e4dfed96117edd7df9ec4b752bd2bf8186

strings.conf

@@ -953,3 +953,7 @@
 !setname 0x124 机械天使	機械天使
 !setname 0x125 笑容	スマイル
 !setname 0x126 时间怪盗	Time Thief
+!setname 0x127 咒眼
+!setname 0x128 无限启动
+!setname 0x129 魔女术
+!setname 0x130 恩底弥翁