Merge branch 'master' into patch-miniaudio

gframe/game.cpp

@@ -138,6 +138,7 @@ bool Game::Initialize() {
 			L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/System/Library/Fonts/PingFang.ttc",
+			L"/System/Library/Fonts/STHeiti Medium.ttc",
 			L"./fonts/textFont.ttf",
 			L"./fonts/textFont.ttc",
 			L"./fonts/textFont.otf"
@@ -1342,14 +1343,6 @@ void Game::LoadConfig() {
 		} else if(!std::strcmp(strbuf, "errorlog")) {
 			unsigned int val = std::strtol(valbuf, nullptr, 10);
 			enable_log = val & 0xff;
-		} else if(!std::strcmp(strbuf, "textfont")) {
-			int textfontsize = 0;
-			if (std::sscanf(linebuf, "%63s = %959s %d", strbuf, valbuf, &textfontsize) != 3)
-				continue;
-			gameConf.textfontsize = textfontsize;
-			BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
-		} else if(!std::strcmp(strbuf, "numfont")) {
-			BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
 		} else if(!std::strcmp(strbuf, "serverport")) {
 			gameConf.serverport = std::strtol(valbuf, nullptr, 10);
 		} else if(!std::strcmp(strbuf, "lasthost")) {
@@ -1444,7 +1437,18 @@ void Game::LoadConfig() {
 			// options allowing multiple words
 			if (std::sscanf(linebuf, "%63s = %959[^\n]", strbuf, valbuf) != 2)
 				continue;
-			if (!std::strcmp(strbuf, "nickname")) {
+			if (!std::strcmp(strbuf, "textfont")) {
+				char* last_space = std::strrchr(valbuf, ' ');
+				if (last_space == nullptr)
+					continue;
+				int fontsize = std::strtol(last_space + 1, nullptr, 10);
+				if (fontsize > 0)
+					gameConf.textfontsize = fontsize;
+				*last_space = 0;
+				BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
+			} else if (!std::strcmp(strbuf, "numfont")) {
+				BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
+			} else if (!std::strcmp(strbuf, "nickname")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.nickname);
 			} else if (!std::strcmp(strbuf, "gamename")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.gamename);

gframe/premake5.lua

@@ -68,7 +68,6 @@ project "YGOPro"
     filter "system:windows"
         defines { "_IRR_WCHAR_FILESYSTEM" }
         files "ygopro.rc"
-        libdirs { "$(DXSDK_DIR)Lib/x86" }
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "irrKlang" }

premake/event/premake5.lua

@@ -11,3 +11,4 @@ project "event"
     filter "system:windows"
         prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" }
         files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
+        defines { "WIN32" } -- quirk of old libevent

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_",
-}

premake5.lua

@@ -214,7 +214,6 @@ workspace "YGOPro"
     configurations { "Release", "Debug" }
 
     filter "system:windows"
-        defines { "WIN32", "_WIN32" }
         entrypoint "mainCRTStartup"
         systemversion "latest"
         startproject "YGOPro"