Merge branch 'server' into server-develop

gframe/data_manager.cpp

@@ -112,10 +112,9 @@ bool DataManager::LoadDB(irr::io::IReadFile* reader) {
 	spmembuffer_t* mem = (spmembuffer_t*)std::calloc(sizeof(spmembuffer_t), 1);
 	spmemvfs_env_init();
 	mem->total = mem->used = reader->getSize();
-	mem->data = (char*)std::malloc(mem->total + 1);
+	mem->data = (char*)std::malloc(mem->total);
 	reader->read(mem->data, mem->total);
 	reader->drop();
-	(mem->data)[mem->total] = '\0';
 	bool ret{};
 	if (spmemvfs_open_db(&db, "temp.db", mem) != SQLITE_OK)
 		ret = Error(db.handle);

gframe/game.cpp

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

gframe/premake5.lua

@@ -28,7 +28,7 @@ end
         defines { "SERVER_PRO3_SUPPORT" }
     end
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", LUA_LIB_NAME, "sqlite3", "event" }
+    links { "ocgcore", "clzma", "sqlite3", "event" }
     if SERVER_ZIP_SUPPORT then
         defines { "SERVER_ZIP_SUPPORT" }
         links { "irrlicht", "cspmemvfs" }
@@ -50,10 +50,13 @@ project "ygopro"
 
     files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
+    links { "ocgcore", "clzma", "cspmemvfs", "sqlite3", "irrlicht", "freetype", "event" }
 end
+    if not OCGCORE_DYNAMIC then
+        links { LUA_LIB_NAME }
+    end
 
-    if not BUILD_LUA then
+    if not BUILD_LUA and not OCGCORE_DYNAMIC then
         libdirs { LUA_LIB_DIR }
     end
 
@@ -163,7 +166,11 @@ end
 
     filter "system:linux"
         links { "dl", "pthread" }
-        linkoptions { "-static-libstdc++", "-static-libgcc" }
+        if USE_DYNAMIC then
+            linkoptions { "-Wl,-rpath=./" }
+        else
+            linkoptions { "-static-libstdc++", "-static-libgcc" }
+        end
 if not SERVER_MODE then
         links { "GL", "X11", "Xxf86vm" }
         linkoptions { "-fopenmp" }

ocgcore @ fa884004

-Subproject commit bb55bc97d852740c3f8381ba7ad9dce25408c5b2
+Subproject commit fa884004d6c1a5dd5f240f34e955d65c16a87af0

premake/lua/premake5.lua

@@ -8,10 +8,6 @@ project "lua"
     if not GetParam("no-lua-safe") then
         removefiles { "src/linit.c" }
     end
-    
-    if SERVER_PRO3_SUPPORT then
-        defines { "LUA_USE_LONGJMP" }
-    end
 
     filter "configurations:Debug"
         defines { "LUA_USE_APICHECK" }
@@ -24,3 +20,6 @@ project "lua"
 
     filter "system:linux"
         defines { "LUA_USE_LINUX" }
+        if USE_DYNAMIC then
+            pic "On"
+        end

premake5.lua

@@ -27,6 +27,7 @@ IRRKLANG_PRO = false
 IRRKLANG_PRO_BUILD_IKPMP3 = false
 -- ocgcore dynamic
 OCGCORE_DYNAMIC = false
+USE_DYNAMIC = false
 
 SERVER_MODE = true
 SERVER_ZIP_SUPPORT = false
@@ -408,6 +409,10 @@ if GetParam("ocgcore-dynamic") then
     OCGCORE_DYNAMIC = true
 end
 
+if OCGCORE_DYNAMIC or USE_AUDIO and AUDIO_LIB=='irrklang' and not IRRKLANG_PRO then
+    USE_DYNAMIC = true
+end
+
 workspace "YGOPro"
     location "build"
     language "C++"
@@ -423,6 +428,10 @@ workspace "YGOPro"
         ApplyBoolean(boolOption)
     end
 
+    if SERVER_PRO3_SUPPORT then
+        defines { "LUA_USE_LONGJMP" }
+    end
+
     filter "system:windows"
         systemversion "latest"
         startproject "YGOPro"

script @ 31056b09

-Subproject commit 6ac35b047b0b8a4adeeef7fa0ee2aa8f00cd262b
+Subproject commit 31056b09f24b5a00f3b8bf8b804c9849367cfea9

strings.conf

@@ -829,6 +829,7 @@
 !setname 0x66 战士	ウォリアー
 !setname 0x1066 音响战士	音響戦士
 !setname 0x2066 磁石战士	マグネット・ウォリアー
+!setname 0x6066 磁石战士Σ	磁石の戦士Σ
 #setname 0x67 钢铁	アイアン
 #setname 0x68 铁皮	ブリキ
 !setname 0x69 圣刻	聖刻
@@ -1040,7 +1041,7 @@
 !setname 0xfd 星杯
 !setname 0xfe 星遗物	星遺物
 !setname 0xff 幻透翼	クリアウィング
-!setname 0x100 化学结合	ボンディング
+!setname 0x100 结合术	ボンディング
 !setname 0x101 码语者	コード・トーカー
 !setname 0x102 弹丸	ヴァレット
 !setname 0x103 幻变骚灵	オルターガイスト
@@ -1282,3 +1283,6 @@
 !setname 0x1d4 纠罪巧	糾罪巧
 !setname 0x1d5 杀手级调整曲	キラーチューン
 !setname 0x1d6 树熊	コアラ
+!setname 0x1d7 艾克莉西娅	エクレシア
+!setname 0x1d8 耀圣	エルフェンノーツ
+!setname 0x1d9 磁力	マグネット