Merge branch 'master' of github.com:Fluorohydride/ygopro into develop

gframe/config.h

@@ -95,20 +95,7 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 	return fp;
 }
 
-#if !defined(_WIN32)
 #define myfopen std::fopen
-#elif defined(WDK_NTDDI_VERSION) && (WDK_NTDDI_VERSION >= 0x0A000005) // Redstone 4, Version 1803, Build 17134.
-#define FOPEN_WINDOWS_SUPPORT_UTF8
-#define myfopen std::fopen
-#else
-inline FILE* myfopen(const char* filename, const char* mode) {
-	wchar_t wfilename[256]{};
-	BufferIO::DecodeUTF8(filename, wfilename);
-	wchar_t wmode[20]{};
-	BufferIO::CopyCharArray(mode, wmode);
-	return _wfopen(wfilename, wmode);
-}
-#endif
 
 #include <irrlicht.h>
 

gframe/data_manager.cpp

@@ -10,7 +10,10 @@ irr::io::IFileSystem* DataManager::FileSystem = nullptr;
 DataManager dataManager;
 
 DataManager::DataManager() : _datas(32768), _strings(32768) {
-	extra_setcode = { {8512558u, {0x8f, 0x54, 0x59, 0x82, 0x13a}}, };
+	extra_setcode = { 
+		{8512558u, {0x8f, 0x54, 0x59, 0x82, 0x13a}},
+		{55088578u, {0x8f, 0x54, 0x59, 0x82, 0x13a}},
+	};
 }
 bool DataManager::ReadDB(sqlite3* pDB) {
 	sqlite3_stmt* pStmt = nullptr;

gframe/gframe.cpp

@@ -9,6 +9,10 @@
 #import <CoreFoundation/CoreFoundation.h>
 #endif
 
+#if defined(_WIN32) && (!defined(WDK_NTDDI_VERSION) || (WDK_NTDDI_VERSION < 0x0A000005)) // Redstone 4, Version 1803, Build 17134.
+#error "This program requires the Windows 10 SDK version 1803 or above to compile on Windows. Otherwise, non-ASCII characters will not be displayed or processed correctly."
+#endif
+
 unsigned int enable_log = 0x3;
 bool exit_on_return = false;
 bool auto_watch_mode = false;
@@ -27,11 +31,11 @@ void ClickButton(irr::gui::IGUIElement* btn) {
 }
 
 int main(int argc, char* argv[]) {
-#if defined(FOPEN_WINDOWS_SUPPORT_UTF8)
+#if defined(_WIN32)
 	std::setlocale(LC_CTYPE, ".UTF-8");
 #elif defined(__APPLE__)
 	std::setlocale(LC_CTYPE, "UTF-8");
-#elif !defined(_WIN32)
+#else
 	std::setlocale(LC_CTYPE, "");
 #endif
 #ifdef __APPLE__

strings.conf

@@ -676,6 +676,8 @@
 !counter 0x6c 访问指示物
 !counter 0x6d 祝台指示物
 !counter 0x6e 四季指示物
+!counter 0x6f 龋齿指示物
+!counter 0x70 盘子指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1260,7 +1262,7 @@
 !setname 0x1c2 喷水引擎	アクア・ジェット
 !setname 0x1c3 巳剑	Mitsurugi
 !setname 0x1c4 征龙	征竜
-!setname 0x1c5 再世	再世
+!setname 0x1c5 再世	リジェネシス
 !setname 0x1c6 统王	ドミナス
 !setname 0x1c7 塞勒凯特	Serket
 !setname 0x1c8 阿匹卜	Apophis
@@ -1270,3 +1272,7 @@
 !setname 0x1cc 瞬间移动	テレポート
 !setname 0x1cd 神艺	アルトメギア
 !setname 0x1ce 狱神	獄神
+!setname 0x1cf 奏悦机组	R.B.
+!setname 0x1d0 死伟王	死偉王
+!setname 0x1d1 绚岚	絢嵐
+!setname 0x1d2 终刻	ドゥームズ