Merge remote-tracking branch 'fh/master' into mc

gframe/menu_handler.cpp

@@ -309,6 +309,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					int extra = replay.ReadInt32();
 					for(int j = 0; j < extra; ++j)
 						tmp_deck.extra.push_back(dataManager.GetCodePointer(replay.ReadInt32()));
+					FileSystem::SafeFileName(namebuf[i]);
 					myswprintf(filename, L"deck/%ls-%d %ls.ydk", ex_filename, i + 1, namebuf[i]);
 					deckManager.SaveDeck(tmp_deck, filename);
 				}

gframe/myfilesystem.h

@@ -19,6 +19,11 @@
 
 class FileSystem {
 public:
+	static void SafeFileName(wchar_t* wfile) {
+		while((wfile = wcspbrk(wfile, L"<>:\"/\\|?*")) != NULL)
+			*wfile++ = '_';
+	}
+
 	static bool IsFileExists(const wchar_t* wfile) {
 		DWORD attr = GetFileAttributesW(wfile);
 		return attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY);
@@ -112,6 +117,11 @@ public:
 
 class FileSystem {
 public:
+	static void SafeFileName(wchar_t* wfile) {
+		while((wfile = wcspbrk(wfile, L"/")) != NULL)
+			*wfile++ = '_';
+	}
+	
 	static bool IsFileExists(const char* file) {
 		struct stat fileStat;
 		return (stat(file, &fileStat) == 0) && !S_ISDIR(fileStat.st_mode);

system.conf

@@ -8,8 +8,8 @@ nickname = Player
 gamename = Game
 lastcategory = 未分类卡组
 lastdeck = new
-textfont = c:/windows/fonts/simsun.ttc 14
-numfont = c:/windows/fonts/arialbd.ttf
+textfont = ./fonts/textFont.ttf 14
+numfont = ./fonts/numFont.ttf
 serverport = 7911
 lasthost = 127.0.0.1
 lastport = 7911