Merge branch 'master' into another

appveyor.yml

 version: '{build}'
+image: Visual Studio 2017
 
 environment:
   irrklang_pro: 1
@@ -40,7 +41,7 @@ install:
   - patch -p0 < irrlicht\irrlicht.patch
 
   # premake
-  - premake5 vs2015
+  - premake5 vs2017
   
 configuration: Release
 

gframe/event_handler.cpp

@@ -2348,7 +2348,8 @@ void ClientField::ShowCardInfoInList(ClientCard* pcard, irr::gui::IGUIElement* e
 	if(pcard->code) {
 		str.append(dataManager.GetName(pcard->code));
 	}
-	if(pcard->status & STATUS_PROC_COMPLETE)
+	if((pcard->status & STATUS_PROC_COMPLETE)
+		&& (pcard->type & (TYPE_RITUAL | TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK | TYPE_SPSUMMON)))
 		str.append(L"\n").append(dataManager.GetSysString(224));
 	for(size_t i = 0; i < chains.size(); ++i) {
 		wchar_t formatBuffer[2048];

gframe/myfilesystem.h

@@ -5,10 +5,7 @@
 #include <functional>
 #include "bufferio.h"
 
-#ifdef _WIN32
-#include <direct.h>
-#include <sys/stat.h>
-#else
+#ifndef _WIN32
 #include <dirent.h>
 #include <sys/stat.h>
 #endif
@@ -20,8 +17,8 @@
 class FileSystem {
 public:
 	static bool IsFileExists(const wchar_t* wfile) {
-		struct _stat fileStat;
-		return (_wstat(wfile, &fileStat) == 0) && !(fileStat.st_mode & _S_IFDIR);
+		DWORD attr = GetFileAttributesW(wfile);
+		return attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY);
 	}
 
 	static bool IsFileExists(const char* file) {
@@ -31,8 +28,8 @@ public:
 	}
 
 	static bool IsDirExists(const wchar_t* wdir) {
-		struct _stat fileStat;
-		return (_wstat(wdir, &fileStat) == 0) && (fileStat.st_mode & _S_IFDIR);
+		DWORD attr = GetFileAttributesW(wdir);
+		return attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY);
 	}
 
 	static bool IsDirExists(const char* dir) {
@@ -42,7 +39,7 @@ public:
 	}
 
 	static bool MakeDir(const wchar_t* wdir) {
-		return _wmkdir(wdir) == 0;
+		return CreateDirectoryW(wdir, NULL);
 	}
 
 	static bool MakeDir(const char* dir) {

ocgcore @ 05f636fd

-Subproject commit d7d50a64735386f200de36b2ae0175be47164fdf
+Subproject commit 05f636fd6248114ae8676d9f453c11e14f157eaf

premake5.lua

@@ -15,9 +15,16 @@ solution "ygo"
         defines { "WIN32", "_WIN32", "WINVER=0x0501" }
         libdirs { "$(DXSDK_DIR)Lib/x86" }
         entrypoint "mainCRTStartup"
-        toolset "v140_xp"
+        --toolset "v141_xp"
+        systemversion "latest"
         startproject "ygopro"
 
+    configuration { "windows", "vs2017" }
+        toolset "v141_xp"
+
+    configuration { "windows", "not vs2017" }
+        toolset "v140_xp"
+
     configuration "bsd"
         defines { "LUA_USE_POSIX" }
         includedirs { "/usr/local/include" }

script @ bb1beb06

-Subproject commit 87b2a039e3b02c8fad75aa53719095e60c866466
+Subproject commit bb1beb063bb893897fee2b40453633136d6bed8f