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

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);

ocgcore @ dab36a5d

-Subproject commit 550622ba2560fa2741e6e23673c6af7db4c0d0f9
+Subproject commit dab36a5d7b8fb960612afd1cd77395dd130532d3