修正启用 use_sql_db 之后终端出现来源数据表为 (null) 的问题

Author: CairoLee

conf/msg_conf/translation_cn.yml

@@ -1596,6 +1596,8 @@ Body:
   Translation: "正在准备加载 '[{CL_WHITE}]%d[{CL_RESET}]' 张地图.\n"
 - Original: "Loading '[{CL_WHITE}]%[{PRIdPTR}][{CL_RESET}]' entries in '[{CL_WHITE}]%s[{CL_RESET}]'\n"
   Translation: "将读取 [{CL_WHITE}]%-5[{PRIdPTR}][{CL_RESET}] 组数据, 源于 '[{CL_WHITE}]%s[{CL_RESET}]'\n"
+- Original: "Loading '[{CL_WHITE}]%[{PRIu64}][{CL_RESET}]' entries in '[{CL_WHITE}]%s[{CL_RESET}]'\n"
+  Translation: "将读取 [{CL_WHITE}]%-5[{PRIu64}][{CL_RESET}] 组数据, 源于 '[{CL_WHITE}]%s[{CL_RESET}]'\n"
 - Original: "Loading '[{CL_WHITE}]%s[{CL_RESET}]'...[{CL_CLL}]\r"
   Translation: "正在加载 '[{CL_WHITE}]%s[{CL_RESET}]'...[{CL_CLL}]\r"
 - Original: "Loading Char Data ([{CL_BOLD}]%d[{CL_RESET}])\n"

conf/msg_conf/translation_tw.yml

@@ -1596,6 +1596,8 @@ Body:
   Translation: "正在準備載入 '[{CL_WHITE}]%d[{CL_RESET}]' 張地圖.\n"
 - Original: "Loading '[{CL_WHITE}]%[{PRIdPTR}][{CL_RESET}]' entries in '[{CL_WHITE}]%s[{CL_RESET}]'\n"
   Translation: "將讀取 [{CL_WHITE}]%-5[{PRIdPTR}][{CL_RESET}] 組資料, 源於 '[{CL_WHITE}]%s[{CL_RESET}]'\n"
+- Original: "Loading '[{CL_WHITE}]%[{PRIu64}][{CL_RESET}]' entries in '[{CL_WHITE}]%s[{CL_RESET}]'\n"
+  Translation: "將讀取 [{CL_WHITE}]%-5[{PRIu64}][{CL_RESET}] 組資料, 源於 '[{CL_WHITE}]%s[{CL_RESET}]'\n"
 - Original: "Loading '[{CL_WHITE}]%s[{CL_RESET}]'...[{CL_CLL}]\r"
   Translation: "正在載入 '[{CL_WHITE}]%s[{CL_RESET}]'...[{CL_CLL}]\r"
 - Original: "Loading Char Data ([{CL_BOLD}]%d[{CL_RESET}])\n"

src/config/pandas.hpp

@@ -1022,6 +1022,9 @@
 	//
 	// 特别感谢 "HongShin" 指出此问题
 	#define Pandas_Fix_ScriptControl_Shop_Missing_NpcID_Error
+
+	// 修正启用 use_sql_db 之后终端加载信息出现来源数据表为 (null) 的问题 [Sola丶小克]
+	#define Pandas_Fix_Use_SQL_DB_Make_Terminal_Show_Null
 #endif // Pandas_Bugfix
 
 // ============================================================================

src/map/itemdb.cpp

@@ -4363,7 +4363,11 @@ static int itemdb_read_sqldb(void) {
 		uint32 total_columns = Sql_NumColumns(mmysql_handle);
 		uint64 total_rows = Sql_NumRows(mmysql_handle), rows = 0, count = 0;
 
+#ifndef Pandas_Fix_Use_SQL_DB_Make_Terminal_Show_Null
 		ShowStatus("Loading '" CL_WHITE "%" PRIdPTR CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", total_rows, item_db_name[fi]);
+#else
+		ShowStatus("Loading '" CL_WHITE "%" PRIu64 CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", total_rows, item_db_name[fi]);
+#endif // Pandas_Fix_Use_SQL_DB_Make_Terminal_Show_Null
 
 		// process rows one by one
 		while( SQL_SUCCESS == Sql_NextRow(mmysql_handle) ) {

src/map/mob.cpp

@@ -5607,7 +5607,11 @@ static int mob_read_sqldb(void)
 		uint32 total_columns = Sql_NumColumns(mmysql_handle);
 		uint64 total_rows = Sql_NumRows(mmysql_handle), rows = 0, count = 0;
 
+#ifndef Pandas_Fix_Use_SQL_DB_Make_Terminal_Show_Null
 		ShowStatus("Loading '" CL_WHITE "%" PRIdPTR CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", total_rows, mob_db_name[fi]);
+#else
+		ShowStatus("Loading '" CL_WHITE "%" PRIu64 CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", total_rows, mob_db_name[fi]);
+#endif // Pandas_Fix_Use_SQL_DB_Make_Terminal_Show_Null
 
 		// process rows one by one
 		while( SQL_SUCCESS == Sql_NextRow(mmysql_handle) ) {