Merge branch 'fh' into patch-miniaudio

.github/workflows/build.yml

@@ -121,6 +121,7 @@ jobs:
     - name: Copy premake files
       run: |
         xcopy /E premake\* .
+        xcopy /E resource\* .
 
     - name: Use premake to generate Visual Studio solution (2019)
       if: matrix.os == 'windows-2019'
@@ -217,6 +218,7 @@ jobs:
     - name: Copy premake files
       run: |
         cp -r premake/* .
+        cp -r resource/* .
 
     - name: Use premake to generate make files
       run: |
@@ -309,6 +311,7 @@ jobs:
     - name: Copy premake files
       run: |
         cp -r premake/* .
+        cp -r resource/* .
 
     - name: Use premake to generate make files (Intel)
       if: runner.arch == 'X64'

gframe/deck_manager.cpp

@@ -75,7 +75,7 @@ static unsigned int checkAvail(unsigned int ot, unsigned int avail) {
 		return DECKERROR_TCGONLY;
 	return DECKERROR_NOTAVAIL;
 }
-unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) {
+unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int rule) {
 	std::unordered_map<int, int> ccount;
 	// rule
 	if(deck.main.size() < DECK_MIN_SIZE || deck.main.size() > DECK_MAX_SIZE)

gframe/deck_manager.h

@@ -46,7 +46,7 @@ public:
 	void LoadLFList();
 	const wchar_t* GetLFListName(unsigned int lfhash);
 	const LFList* GetLFList(unsigned int lfhash);
-	unsigned int CheckDeck(Deck& deck, int lfhash, int rule);
+	unsigned int CheckDeck(const Deck& deck, unsigned int lfhash, int rule);
 	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist = false);
 	int LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_packlist = false);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);

gframe/premake5.lua

@@ -7,6 +7,7 @@ end
 project "YGOPro"
     kind "WindowedApp"
     cppdialect "C++14"
+    rtti "Off"
 
     files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
@@ -50,8 +51,6 @@ project "YGOPro"
         files "ygopro.rc"
         libdirs { "$(DXSDK_DIR)Lib/x86" }
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
-    filter "not action:vs*"
-        buildoptions { "-fno-rtti" }
     filter "not system:windows"
         links { "event_pthreads", "dl", "pthread" }
     filter "system:macosx"

premake/event/premake5.lua

 project "event"
     kind "StaticLib"
-    cdialect "C11"
 
     includedirs { "include", "compat" }
 

premake/freetype/premake5.lua

 project "freetype"
     kind "StaticLib"
-    cdialect "C11"
 
     includedirs { "include" }
     defines { "FT2_BUILD_LIBRARY" }

premake/irrlicht/defines.lua

+defines {
+	"_IRR_STATIC_LIB_",
+	"NO_IRR_USE_NON_SYSTEM_BZLIB_",
+	"NO_IRR_COMPILE_WITH_BZIP2_",
+	"NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
+	"NO_IRR_COMPILE_WITH_DIRECT3D_8_",
+	"NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
+	"NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
+	"NO_IRR_COMPILE_WITH_SOFTWARE_",
+	"NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
+	"NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
+	"NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
+	"NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
+	"NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
+	"NO_IRR_COMPILE_WITH_MD2_LOADER_",
+	"NO_IRR_COMPILE_WITH_MD3_LOADER_",
+	"NO_IRR_COMPILE_WITH_3DS_LOADER_",
+	"NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
+	"NO_IRR_COMPILE_WITH_CSM_LOADER_",
+	"NO_IRR_COMPILE_WITH_BSP_LOADER_",
+	"NO_IRR_COMPILE_WITH_DMF_LOADER_",
+	"NO_IRR_COMPILE_WITH_LMTS_LOADER_",
+	"NO_IRR_COMPILE_WITH_MY3D_LOADER_",
+	"NO_IRR_COMPILE_WITH_OBJ_LOADER_",
+	"NO_IRR_COMPILE_WITH_OCT_LOADER_",
+	"NO_IRR_COMPILE_WITH_LWO_LOADER_",
+	"NO_IRR_COMPILE_WITH_STL_LOADER_",
+	"NO_IRR_COMPILE_WITH_PLY_LOADER_",
+	"NO_IRR_COMPILE_WITH_SMF_LOADER_",
+	"NO_IRR_COMPILE_WITH_IRR_WRITER_",
+	"NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
+	"NO_IRR_COMPILE_WITH_STL_WRITER_",
+	"NO_IRR_COMPILE_WITH_OBJ_WRITER_",
+	"NO_IRR_COMPILE_WITH_PLY_WRITER_",
+	"NO_IRR_COMPILE_WITH_PCX_LOADER_",
+	"NO_IRR_COMPILE_WITH_PPM_LOADER_",
+	"NO_IRR_COMPILE_WITH_PSD_LOADER_",
+	"NO_IRR_COMPILE_WITH_TGA_LOADER_",
+	"NO_IRR_COMPILE_WITH_WAL_LOADER_",
+	"NO_IRR_COMPILE_WITH_LMP_LOADER_",
+	"NO_IRR_COMPILE_WITH_RGB_LOADER_",
+	"NO_IRR_COMPILE_WITH_PCX_WRITER_",
+	"NO_IRR_COMPILE_WITH_PPM_WRITER_",
+	"NO_IRR_COMPILE_WITH_PSD_WRITER_",
+	"NO_IRR_COMPILE_WITH_TGA_WRITER_",
+	"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
+	"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
+	"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
+}

premake/sqlite3/premake5.lua

 project "sqlite3"
     kind "StaticLib"
-    cdialect "C11"
 
     files { "sqlite3.c", "sqlite3.h" }

premake5.lua

@@ -156,7 +156,7 @@ workspace "YGOPro"
             flags { "LinkTimeOptimization" }
         end
         staticruntime "On"
-        disablewarnings { "4244", "4267", "4838", "4577", "4018", "4996", "4477", "4091", "4800", "6011", "6031", "6054", "6262" }
+        disablewarnings { "4244", "4267", "4838", "4996", "6011", "6031", "6054", "6262" }
 
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
@@ -169,6 +169,10 @@ workspace "YGOPro"
         disablewarnings { "6011", "6031", "6054", "6262" }
 
     filter "action:vs*"
+        cdialect "C11"
+        if not WINXP_SUPPORT then
+           conformancemode "On" 
+        end
         vectorextensions "SSE2"
         buildoptions { "/utf-8" }
         defines { "_CRT_SECURE_NO_WARNINGS" }

strings.conf

@@ -1249,3 +1249,5 @@
 !setname 0x1c4 征龙	征竜
 !setname 0x1c5 再世	再世
 !setname 0x1c6 统王	ドミナス
+!setname 0x1c7 塞勒凯特	Serket
+!setname 0x1c8 阿匹卜	Apophis