Merge branch 'master' into server

.github/workflows/build.yml

 name: Automated Test Build
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches: [ "master" ]
@@ -120,7 +124,7 @@ jobs:
     - name: Download miniaudio
       if: matrix.audiolib == 'miniaudio'
       run: |
-        git clone --depth=1 https://github.com/mercury233/miniaudio
+        git clone --depth=1 -b 0.11.23 https://github.com/mackron/miniaudio
         cd miniaudio
         xcopy /Y extras\miniaudio_split\miniaudio.* .
         cd ..
@@ -367,7 +371,7 @@ jobs:
 
     - name: Download miniaudio
       run: |
-        git clone --depth=1 https://github.com/mercury233/miniaudio
+        git clone --depth=1 -b 0.11.23 https://github.com/mackron/miniaudio
         cd miniaudio
         cp extras/miniaudio_split/miniaudio.* .
         cd ..
@@ -590,7 +594,7 @@ jobs:
 
     - name: Download miniaudio
       run: |
-        git clone --depth=1 https://github.com/mercury233/miniaudio
+        git clone --depth=1 -b 0.11.23 https://github.com/mackron/miniaudio
         cd miniaudio
         cp extras/miniaudio_split/miniaudio.* .
         cd ..

gframe/data_manager.cpp

@@ -8,6 +8,9 @@ namespace ygo {
 
 unsigned char DataManager::scriptBuffer[0x100000] = {};
 DataManager dataManager;
+static const char SELECT_STMT[] = "SELECT datas.id, datas.ot, datas.alias, datas.setcode, datas.type, datas.atk, datas.def, datas.level, datas.race, datas.attribute, datas.category,"
+" texts.name, texts.desc, texts.str1, texts.str2, texts.str3, texts.str4, texts.str5, texts.str6, texts.str7, texts.str8,"
+" texts.str9, texts.str10, texts.str11, texts.str12, texts.str13, texts.str14, texts.str15, texts.str16 FROM datas INNER JOIN texts ON datas.id = texts.id";
 
 DataManager::DataManager() : _datas(32768), _strings(32768) {
 	extra_setcode = { 
@@ -17,12 +20,7 @@ DataManager::DataManager() : _datas(32768), _strings(32768) {
 }
 bool DataManager::ReadDB(sqlite3* pDB) {
 	sqlite3_stmt* pStmt = nullptr;
-#ifdef YGOPRO_SERVER_MODE
-	const char* sql = "select * from datas";
-#else
-	const char* sql = "select * from datas,texts where datas.id=texts.id";
-#endif
-	if (sqlite3_prepare_v2(pDB, sql, -1, &pStmt, nullptr) != SQLITE_OK)
+	if (sqlite3_prepare_v2(pDB, SELECT_STMT, -1, &pStmt, nullptr) != SQLITE_OK)
 		return Error(pDB, pStmt);
 #ifndef YGOPRO_SERVER_MODE
 	wchar_t strBuffer[4096];
@@ -55,17 +53,16 @@ bool DataManager::ReadDB(sqlite3* pDB) {
 		cd.category = static_cast<decltype(cd.category)>(sqlite3_column_int64(pStmt, 10));
 #ifndef YGOPRO_SERVER_MODE
 		auto& cs = _strings[code];
-		if (const char* text = (const char*)sqlite3_column_text(pStmt, 12)) {
+		if (const char* text = (const char*)sqlite3_column_text(pStmt, 11)) {
 			BufferIO::DecodeUTF8(text, strBuffer);
 			cs.name = strBuffer;
 		}
-		if (const char* text = (const char*)sqlite3_column_text(pStmt, 13)) {
+		if (const char* text = (const char*)sqlite3_column_text(pStmt, 12)) {
 			BufferIO::DecodeUTF8(text, strBuffer);
 			cs.text = strBuffer;
 		}
-		constexpr int desc_count = sizeof cs.desc / sizeof cs.desc[0];
-		for (int i = 0; i < desc_count; ++i) {
-			if (const char* text = (const char*)sqlite3_column_text(pStmt, i + 14)) {
+		for (int i = 0; i < DESC_COUNT; ++i) {
+			if (const char* text = (const char*)sqlite3_column_text(pStmt, 13 + i)) {
 				BufferIO::DecodeUTF8(text, strBuffer);
 				cs.desc[i] = strBuffer;
 			}

gframe/data_manager.h

@@ -19,7 +19,7 @@ namespace ygo {
 constexpr int MAX_STRING_ID = 0x7ff;
 constexpr uint32_t MIN_CARD_ID = (uint32_t)(MAX_STRING_ID + 1) >> 4;
 constexpr uint32_t MAX_CARD_ID = 0x0fffffffU;
-	
+
 using CardData = card_data;
 struct CardDataC {
 	uint32_t code{};
@@ -49,10 +49,11 @@ struct CardDataC {
 		return false;
 	}
 };
+constexpr int DESC_COUNT = 16;
 struct CardString {
 	std::wstring name;
 	std::wstring text;
-	std::wstring desc[16];
+	std::wstring desc[DESC_COUNT];
 };
 using code_pointer = std::unordered_map<uint32_t, CardDataC>::const_iterator;
 using string_pointer = std::unordered_map<uint32_t, CardString>::const_iterator;

ocgcore @ 3ad02226

-Subproject commit 2d486e69c162df2008bf3a534fbe176fb500fd0f
+Subproject commit 3ad02226f8e6c2e2e9bc193341585154030304a9

script @ ca9b8af4

-Subproject commit 864b7ef22fdcf68570a488d1834cae9086a63b5e
+Subproject commit ca9b8af4c90cf1422b903594b086ce5e2dfd0e93