Merge branch 'test' of github.com:mercury233/ygopro

gframe/data_manager.h

@@ -3,7 +3,7 @@
 
 #include "config.h"
 #include "sqlite3.h"
-#include "spmemvfs.h"
+#include "spmemvfs/spmemvfs.h"
 #include "client_card.h"
 #include <unordered_map>
 

gframe/game.cpp

@@ -1974,6 +1974,8 @@ void Game::OnResize() {
 	lstLog->setRelativePosition(Resize(10, 10, 290, 290));
 	if(showingcode)
 		ShowCardInfo(showingcode, true);
+	else
+		ClearCardInfo();
 	btnClearLog->setRelativePosition(Resize(160, 300, 260, 325));
 
 	wPhase->setRelativePosition(Resize(480, 310, 855, 330));

gframe/myfilesystem.h

@@ -123,8 +123,7 @@ public:
 			return;
 		struct stat fileStat;
 		std::vector<file_unit> file_list;
-		while ((dirp = readdir(dir)) != nullptr)
-		{
+		while((dirp = readdir(dir)) != nullptr) {
 			file_unit funit;
 			char fname[1024];
 			strcpy(fname, path);
@@ -143,7 +142,7 @@ public:
 
 	static bool TraversalDirSort(file_unit file1, file_unit file2) {
 		if(file1.is_dir != file2.is_dir) {
-			return file1.is_dir;
+			return file2.is_dir;
 		} else {
 			return file1.filename < file2.filename;
 		}

gframe/premake4.lua

 include "lzma/."
+include "spmemvfs/."
 
 project "ygopro"
     kind "WindowedApp"
 
     files { "**.cpp", "**.cc", "**.c", "**.h" }
-    excludes "lzma/**"
+    excludes { "lzma/**", "spmemvfs/**" }
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
+    links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
     if USE_IRRKLANG then
         defines { "YGOPRO_USE_IRRKLANG" }
         links { "ikpmp3" }

gframe/spmemvfs/premake4.lua

+project "cspmemvfs"
+    kind "StaticLib"
+    files { "**.c", "**.h" }
+
+    configuration "windows"
+        includedirs { "../../sqlite3" }