Merge branch 'master' into server

.travis.yml

@@ -33,4 +33,4 @@ script:
 - mkdir replay
 
 - echo "select id from datas;" | sqlite3 $DATABASE_FILE | xargs -I {} ./ygopro {} 2>&1 | tee ./redtext.txt
-- bash -c "exit $(cat ./redtext.txt | wc -l)"
\ No newline at end of file
+- bash -c "exit $(cat ./redtext.txt | wc -l)"

gframe/data_manager.h

@@ -4,7 +4,7 @@
 #include "config.h"
 #include "sqlite3.h"
 #ifndef YGOPRO_SERVER_MODE
-#include "spmemvfs.h"
+#include "spmemvfs/spmemvfs.h"
 #endif
 #include "client_card.h"
 #include <unordered_map>

gframe/game.cpp

@@ -2031,6 +2031,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

@@ -156,7 +156,7 @@ public:
 #ifndef YGOPRO_SERVER_MODE
 	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 "ConsoleApp"

gframe/spmemvfs/premake4.lua

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