forked from metin2/server
Applied changes on the db executable. Removed old logging functions. Various global changes.
This commit is contained in:
@ -47,10 +47,6 @@ target_link_libraries(${PROJECT_NAME} effolkronium_random)
|
||||
find_package(fmt CONFIG REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} fmt::fmt)
|
||||
|
||||
# spdlog
|
||||
find_package(spdlog CONFIG REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
|
||||
|
||||
#
|
||||
# System-provided dependencies
|
||||
#
|
||||
|
@ -113,7 +113,7 @@ bool DragonSoulTable::ReadVnumMapper()
|
||||
int n = pGroupNode->GetRowCount();
|
||||
if (0 == n)
|
||||
{
|
||||
sys_err ("Group VnumMapper is Empty.");
|
||||
SPDLOG_ERROR("Group VnumMapper is Empty.");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1671,7 +1671,7 @@ void CInputMain::Move(LPCHARACTER ch, const char * data)
|
||||
*/
|
||||
/*
|
||||
SPDLOG_TRACE(
|
||||
"MOVE: %s Func:%u Arg:%u Pos:%dx%d Time:%u Dist:%.1f",
|
||||
"MOVE: {} Func:{} Arg:{} Pos:{}x{} Time:{} Dist:{:.1f}",
|
||||
ch->GetName(),
|
||||
pinfo->bFunc,
|
||||
pinfo->bArg,
|
||||
|
@ -1188,14 +1188,13 @@ static void __DropEvent_CharStone_DropItem(CHARACTER & killer, CHARACTER & victi
|
||||
|
||||
if (Random::get(1, MaxRange) <= dropPercent)
|
||||
{
|
||||
int log_level = (test_server || killer.GetGMLevel() >= GM_LOW_WIZARD) ? 0 : 1;
|
||||
int victim_level = victim.GetLevel();
|
||||
int level_diff = victim_level - killer_level;
|
||||
|
||||
if (level_diff >= +gs_dropEvent_charStone.level_range || level_diff <= -gs_dropEvent_charStone.level_range)
|
||||
{
|
||||
sys_log(log_level,
|
||||
"dropevent.drop_char_stone.level_range_over: killer(%s: lv%d), victim(%s: lv:%d), level_diff(%d)",
|
||||
SPDLOG_DEBUG(
|
||||
"dropevent.drop_char_stone.level_range_over: killer({}: lv{}), victim({}: lv:{}), level_diff({})",
|
||||
killer.GetName(), killer.GetLevel(), victim.GetName(), victim.GetLevel(), level_diff);
|
||||
return;
|
||||
}
|
||||
@ -1209,8 +1208,8 @@ static void __DropEvent_CharStone_DropItem(CHARACTER & killer, CHARACTER & victi
|
||||
{
|
||||
vec_item.push_back(p_item);
|
||||
|
||||
sys_log(log_level,
|
||||
"dropevent.drop_char_stone.item_drop: killer(%s: lv%d), victim(%s: lv:%d), item_name(%s)",
|
||||
SPDLOG_DEBUG(
|
||||
"dropevent.drop_char_stone.item_drop: killer({}: lv{}), victim({}: lv:{}), item_name({})",
|
||||
killer.GetName(), killer.GetLevel(), victim.GetName(), victim.GetLevel(), p_item->GetName());
|
||||
}
|
||||
}
|
||||
@ -1295,8 +1294,8 @@ static LPITEM __DropEvent_RefineBox_GetDropItem(CHARACTER & killer, CHARACTER &
|
||||
|
||||
//if (level_diff >= +gs_dropEvent_refineBox.level_range || level_diff <= -gs_dropEvent_refineBox.level_range)
|
||||
//{
|
||||
// sys_log(log_level,
|
||||
// "dropevent.drop_refine_box.level_range_over: killer(%s: lv%d), victim(%s: lv:%d), level_diff(%d)",
|
||||
// SPDLOG_DEBUG(
|
||||
// "dropevent.drop_refine_box.level_range_over: killer({}: lv{}), victim({}: lv:{}), level_diff({})",
|
||||
// killer.GetName(), killer.GetLevel(), victim.GetName(), victim.GetLevel(), level_diff);
|
||||
// return NULL;
|
||||
//}
|
||||
@ -1330,16 +1329,14 @@ static void __DropEvent_RefineBox_DropItem(CHARACTER & killer, CHARACTER & victi
|
||||
if (!gs_dropEvent_refineBox.alive)
|
||||
return;
|
||||
|
||||
int log_level = (test_server || killer.GetGMLevel() >= GM_LOW_WIZARD) ? 0 : 1;
|
||||
|
||||
LPITEM p_item = __DropEvent_RefineBox_GetDropItem(killer, victim, itemMgr);
|
||||
|
||||
if (p_item)
|
||||
{
|
||||
vec_item.push_back(p_item);
|
||||
|
||||
sys_log(log_level,
|
||||
"dropevent.drop_refine_box.item_drop: killer(%s: lv%d), victim(%s: lv:%d), item_name(%s)",
|
||||
SPDLOG_DEBUG(
|
||||
"dropevent.drop_refine_box.item_drop: killer({}: lv{}), victim({}: lv:{}), item_name({})",
|
||||
killer.GetName(), killer.GetLevel(), victim.GetName(), victim.GetLevel(), p_item->GetName());
|
||||
}
|
||||
}
|
||||
|
@ -790,14 +790,12 @@ int idle()
|
||||
if (!io_loop(ev_base)) return 0;
|
||||
s_dwProfiler[PROF_IO] += (get_dword_time() - t);
|
||||
|
||||
log_rotate();
|
||||
|
||||
gettimeofday(&now, (struct timezone *) 0);
|
||||
++process_time_count;
|
||||
|
||||
if (now.tv_sec - pta.tv_sec > 0)
|
||||
{
|
||||
pt_log("[%3d] event %5d/%-5d idle %-4ld event %-4ld heartbeat %-4ld I/O %-4ld chrUpate %-4ld | WRITE: %-7d | PULSE: %d",
|
||||
SPDLOG_TRACE("[{:3}] event {:5}/{:<5} idle {:<4} event {:<4} heartbeat {:<4} I/O {:<4} chrUpate {:<4} | WRITE: {:<7} | PULSE: {}",
|
||||
process_time_count,
|
||||
num_events_called,
|
||||
event_count(),
|
||||
|
@ -1648,7 +1648,7 @@ namespace quest
|
||||
vsnprintf(szMsg, sizeof(szMsg), fmt, args);
|
||||
va_end(args);
|
||||
|
||||
_sys_err(func, line, "%s", szMsg);
|
||||
SPDLOG_ERROR("Quest error occurred in [{}:{}}]: {}", func, line, szMsg);
|
||||
if (test_server)
|
||||
{
|
||||
LPCHARACTER ch = GetCurrentCharacterPtr();
|
||||
|
@ -14,8 +14,6 @@
|
||||
#include <common/utils.h>
|
||||
#include <common/service.h>
|
||||
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
Reference in New Issue
Block a user