Merge branch 'server' into full-view

gframe/data_manager.cpp

@@ -82,11 +82,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) {
 			cd.race = sqlite3_column_int(pStmt, 8);
 			cd.attribute = sqlite3_column_int(pStmt, 9);
 			cd.category = sqlite3_column_int(pStmt, 10);
-			auto it = _datas.find(cd.code);
-			if(it != _datas.end())
-				it->second = cd;
-			else
-				_datas.insert(std::make_pair(cd.code, cd));
+			_datas[cd.code] = cd;
 #ifndef YGOPRO_SERVER_MODE
 			if(const char* text = (const char*)sqlite3_column_text(pStmt, 12)) {
 				BufferIO::DecodeUTF8(text, strBuffer);
@@ -102,7 +98,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) {
 					cs.desc[i] = strBuffer;
 				}
 			}
-			_strings.emplace(cd.code, cs);
+			_strings[cd.code] = cs;
 #endif //YGOPRO_SERVER_MODE
 		}
 	} while(step != SQLITE_DONE);

gframe/game.cpp

@@ -211,7 +211,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Disco", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Yurika", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

ocgcore @ 301511f5

-Subproject commit a29b95c480f9a7c85afd6ad8a6c705e3c7fdbcc7
+Subproject commit 301511f52a793f9a940dc352495b62d66454314d

premake/gframe/ygopro.rc

@@ -13,7 +13,7 @@ BLOCK "080404b0"
 BEGIN
 VALUE "FileDescription", "YGOPRO Server Mode ver.Koishi"
 VALUE "InternalName", "YGOPRO Server Mode"
-VALUE "LegalCopyright", "Copyright (C) 2021 Nanahira"
+VALUE "LegalCopyright", "Copyright (C) 2022 Nanahira"
 VALUE "OriginalFilename", "ygopro.exe"
 VALUE "ProductName", "YGOPRO Server Mode"
 VALUE "FileVersion", "Server"

script @ 3c92734b

-Subproject commit 842d696bb912ec5ea8437e8cd048b5d091e3cb27
+Subproject commit 3c92734b2fd41ea2641c94e1447f32d7ae96c1e5