Merge branch 'develop' of https://code.moenext.com/nanahira/ygopro into develop

gframe/data_manager.cpp

@@ -121,6 +121,17 @@ bool DataManager::LoadStrings(const char* file) {
 	std::fclose(fp);
 	return true;
 }
+bool DataManager::LoadStrings(const wchar_t* file) {
+	FILE* fp = mywfopen(file, "r");
+	if(!fp)
+		return false;
+	char linebuf[TEXT_LINE_SIZE]{};
+	while(std::fgets(linebuf, sizeof linebuf, fp)) {
+		ReadStringConfLine(linebuf);
+	}
+	std::fclose(fp);
+	return true;
+}
 bool DataManager::LoadStrings(irr::io::IReadFile* reader) {
 	char ch{};
 	std::string linebuf;

gframe/data_manager.h

@@ -47,6 +47,7 @@ public:
 	bool LoadDB(const wchar_t* wfile);
 	bool LoadDB(irr::io::IReadFile* reader);
 	bool LoadStrings(const char* file);
+	bool LoadStrings(const wchar_t* file);
 	bool LoadStrings(irr::io::IReadFile* reader);
 	void ReadStringConfLine(const char* linebuf);
 	bool LoadServerList(const char* file);

gframe/duelclient.cpp

@@ -386,7 +386,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 			break;
 		}
 		case ERRMSG_VERERROR: {
-			if (temp_ver) {
+			if (temp_ver || !mainGame->gameConf.freever) {
 				temp_ver = 0;
 				mainGame->btnCreateHost->setEnabled(true);
 				mainGame->btnJoinHost->setEnabled(true);

gframe/game.cpp

@@ -1262,9 +1262,7 @@ void Game::LoadExpansions(const wchar_t* expansions_path) {
 				dataManager.LoadServerList(fpath);
 				server_list_changed = true;
 			} else {
-				char upath[1024];
-				BufferIO::EncodeUTF8(fpath, upath);
-				dataManager.LoadStrings(upath);
+				dataManager.LoadStrings(fpath);
 			}
 			return;
 		}
@@ -1543,12 +1541,14 @@ bool Game::LoadConfigFromFile(const char* file) {
 			gameConf.use_d3d = std::strtol(valbuf, nullptr, 10) > 0;
 		} else if(!std::strcmp(strbuf, "use_image_scale")) {
 			gameConf.use_image_scale = std::strtol(valbuf, nullptr, 10) > 0;
-		} else if(!std::strcmp(strbuf, "pro_version")) {
-			PRO_VERSION = std::strtol(valbuf, nullptr, 10);
 		} else if (!std::strcmp(strbuf, "use_image_scale_multi_thread")) {
 			gameConf.use_image_scale_multi_thread = std::strtol(valbuf, nullptr, 10) > 0;
 		} else if (!std::strcmp(strbuf, "use_image_load_background_thread")) {
 			gameConf.use_image_load_background_thread = std::strtol(valbuf, nullptr, 10) > 0;
+		} else if(!std::strcmp(strbuf, "pro_version")) {
+			PRO_VERSION = std::strtol(valbuf, nullptr, 10);
+		} else if(!std::strcmp(strbuf, "freever")) {
+			gameConf.freever = std::strtol(valbuf, nullptr, 10) > 0;
 		} else if(!std::strcmp(strbuf, "errorlog")) {
 			unsigned int val = std::strtol(valbuf, nullptr, 10);
 			enable_log = val & 0xff;
@@ -1821,6 +1821,7 @@ void Game::SaveConfig() {
 	std::fprintf(fp, "use_image_scale_multi_thread = %d\n", gameConf.use_image_scale_multi_thread ? 1 : 0);
 	std::fprintf(fp, "use_image_load_background_thread = %d\n", gameConf.use_image_load_background_thread ? 1 : 0);
 	std::fprintf(fp, "pro_version = %d\n", PRO_VERSION);
+	std::fprintf(fp, "freever = %d\n", gameConf.freever ? 1 : 0);
 	std::fprintf(fp, "antialias = %d\n", gameConf.antialias);
 	std::fprintf(fp, "errorlog = %u\n", enable_log);
 	BufferIO::CopyWideString(ebNickName->getText(), gameConf.nickname);

gframe/game.h

@@ -58,6 +58,7 @@ struct Config {
 #else
 	bool use_image_load_background_thread{ true };
 #endif
+	bool freever{ true };
 	unsigned short antialias{ 0 };
 	unsigned short serverport{ 7911 };
 	unsigned char textfontsize{ 14 };

system.conf

@@ -2,7 +2,10 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
+use_image_scale_multi_thread = 1
+use_image_load_background_thread = 0
 pro_version = 4961
+freever = 1
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi