diff --git a/src/game/ani.cpp b/src/game/ani.cpp index 5720c1b..6bb8e3a 100644 --- a/src/game/ani.cpp +++ b/src/game/ani.cpp @@ -11,7 +11,6 @@ #include "char.h" #include "item.h" #include "ani.h" -#include "dev_log.h" const char* FN_race_name(int race) { @@ -200,7 +199,7 @@ bool ANI::load_one_race(int race, const char *dir_name) for (int weapon = WEAPON_SWORD; weapon < WEAPON_NUM_TYPES; ++weapon) { - dev_log(LOG_DEB0, "ANI (%s,%s)", FN_race_name(race), FN_weapon_type(weapon)); + sys_log(1, "ANI (%s,%s)", FN_race_name(race), FN_weapon_type(weapon)); for (BYTE combo = 1; combo <= 8; ++combo) { @@ -212,11 +211,11 @@ bool ANI::load_one_race(int race, const char *dir_name) m_speed[race][1][weapon][combo] = load_one_weapon(dir_name, weapon, combo, true); m_speed[race][1][weapon][0] = MIN(m_speed[race][1][weapon][0], m_speed[race][1][weapon][combo]); // 최소값 - dev_log(LOG_DEB0, "combo%02d speed=%d horse=%d", + sys_log(1, "combo%02d speed=%d horse=%d", combo, m_speed[race][0][weapon][combo], m_speed[race][1][weapon][combo]); } - dev_log(LOG_DEB0, "minspeed=%u", m_speed[race][0][weapon][0]); + sys_log(1, "minspeed=%u", m_speed[race][0][weapon][0]); } return true; @@ -331,7 +330,7 @@ DWORD ani_attack_speed(LPCHARACTER ch) int weapon = item->GetSubType(); /* - dev_log(LOG_DEB0, "%s : (race,weapon) = (%s,%s) POINT_ATT_SPEED = %d", + sys_log(1, "%s : (race,weapon) = (%s,%s) POINT_ATT_SPEED = %d", ch->GetName(), FN_race_name(race), FN_weapon_type(weapon), diff --git a/src/game/blend_item.cpp b/src/game/blend_item.cpp index 094b9da..e01d5a0 100644 --- a/src/game/blend_item.cpp +++ b/src/game/blend_item.cpp @@ -10,7 +10,6 @@ #include "stdafx.h" #include "constants.h" #include "log.h" -#include "dev_log.h" #include "locale_service.h" #include "item.h" #include "blend_item.h" diff --git a/src/game/char.cpp b/src/game/char.cpp index 16546ff..769b292 100644 --- a/src/game/char.cpp +++ b/src/game/char.cpp @@ -46,7 +46,6 @@ #include "monarch.h" #include "castle.h" #include "arena.h" -#include "dev_log.h" #include "horsename_manager.h" #include "gm.h" #include "map_location.h" @@ -3153,17 +3152,17 @@ void CHARACTER::PointChange(BYTE type, int amount, bool bAmount, bool bBroadcast { if (IsOverTime(OT_NONE)) { - dev_log(LOG_DEB0, " %s = NONE", GetName()); + sys_log(1, " %s = NONE", GetName()); } else if (IsOverTime(OT_3HOUR)) { amount = (amount / 2); - dev_log(LOG_DEB0, " %s = 3HOUR", GetName()); + sys_log(1, " %s = 3HOUR", GetName()); } else if (IsOverTime(OT_5HOUR)) { amount = 0; - dev_log(LOG_DEB0, " %s = 5HOUR", GetName()); + sys_log(1, " %s = 5HOUR", GetName()); } } @@ -3445,17 +3444,17 @@ void CHARACTER::PointChange(BYTE type, int amount, bool bAmount, bool bBroadcast { if (IsOverTime(OT_NONE)) { - dev_log(LOG_DEB0, " %s = NONE", GetName()); + sys_log(1, " %s = NONE", GetName()); } else if (IsOverTime(OT_3HOUR)) { amount = (amount / 2); - dev_log(LOG_DEB0, " %s = 3HOUR", GetName()); + sys_log(1, " %s = 3HOUR", GetName()); } else if (IsOverTime(OT_5HOUR)) { amount = 0; - dev_log(LOG_DEB0, " %s = 5HOUR", GetName()); + sys_log(1, " %s = 5HOUR", GetName()); } } diff --git a/src/game/char_battle.cpp b/src/game/char_battle.cpp index 5579d67..ff71254 100644 --- a/src/game/char_battle.cpp +++ b/src/game/char_battle.cpp @@ -26,7 +26,6 @@ #include "exchange.h" #include "shop_manager.h" #include "castle.h" -#include "dev_log.h" #include "ani.h" #include "BattleArena.h" #include "packet.h" diff --git a/src/game/char_item.cpp b/src/game/char_item.cpp index 99b00e1..09a0c2d 100644 --- a/src/game/char_item.cpp +++ b/src/game/char_item.cpp @@ -34,7 +34,6 @@ #include "castle.h" #include "BattleArena.h" #include "arena.h" -#include "dev_log.h" #include "threeway_war.h" #include "safebox.h" diff --git a/src/game/cmd_general.cpp b/src/game/cmd_general.cpp index e4856f9..1b94630 100644 --- a/src/game/cmd_general.cpp +++ b/src/game/cmd_general.cpp @@ -22,7 +22,6 @@ #include "item_manager.h" #include "monarch.h" #include "mob_manager.h" -#include "dev_log.h" #include "item.h" #include "arena.h" #include "buffer_manager.h" @@ -2179,7 +2178,7 @@ ACMD(do_cube) if (!ch->CanDoCube()) return; - dev_log(LOG_DEB0, "CUBE COMMAND <%s>: %s", ch->GetName(), argument); + sys_log(1, "CUBE COMMAND <%s>: %s", ch->GetName(), argument); int cube_index = 0, inven_index = 0; const char *line; @@ -2272,7 +2271,7 @@ ACMD(do_cube) if (0 != arg2[0]) { while (true == Cube_make(ch)) - dev_log (LOG_DEB0, "cube make success"); + sys_log(1, "cube make success"); } else Cube_make(ch); @@ -2431,7 +2430,7 @@ ACMD(do_click_mall) ACMD(do_ride) { - dev_log(LOG_DEB0, "[DO_RIDE] start"); + sys_log(1, "[DO_RIDE] start"); if (ch->IsDead() || ch->IsStun()) return; @@ -2439,14 +2438,14 @@ ACMD(do_ride) { if (ch->IsHorseRiding()) { - dev_log(LOG_DEB0, "[DO_RIDE] stop riding"); + sys_log(1, "[DO_RIDE] stop riding"); ch->StopRiding(); return; } if (ch->GetMountVnum()) { - dev_log(LOG_DEB0, "[DO_RIDE] unmount"); + sys_log(1, "[DO_RIDE] unmount"); do_unmount(ch, NULL, 0, 0); return; } @@ -2456,7 +2455,7 @@ ACMD(do_ride) { if (ch->GetHorse() != NULL) { - dev_log(LOG_DEB0, "[DO_RIDE] start riding"); + sys_log(1, "[DO_RIDE] start riding"); ch->StartRiding(); return; } @@ -2472,7 +2471,7 @@ ACMD(do_ride) { if (NULL==ch->GetWear(WEAR_UNIQUE1) || NULL==ch->GetWear(WEAR_UNIQUE2)) { - dev_log(LOG_DEB0, "[DO_RIDE] USE UNIQUE ITEM"); + sys_log(1, "[DO_RIDE] USE UNIQUE ITEM"); //ch->EquipItem(item); ch->UseItem(TItemPos (INVENTORY, i)); return; @@ -2487,14 +2486,14 @@ ACMD(do_ride) case 71116: // 산견신이용권 case 71118: // 투지범이용권 case 71120: // 사자왕이용권 - dev_log(LOG_DEB0, "[DO_RIDE] USE QUEST ITEM"); + sys_log(1, "[DO_RIDE] USE QUEST ITEM"); ch->UseItem(TItemPos (INVENTORY, i)); return; } // GF mantis #113524, 52001~52090 번 탈것 if( (item->GetVnum() > 52000) && (item->GetVnum() < 52091) ) { - dev_log(LOG_DEB0, "[DO_RIDE] USE QUEST ITEM"); + sys_log(1, "[DO_RIDE] USE QUEST ITEM"); ch->UseItem(TItemPos (INVENTORY, i)); return; } diff --git a/src/game/config.cpp b/src/game/config.cpp index 7c00da0..cf02571 100644 --- a/src/game/config.cpp +++ b/src/game/config.cpp @@ -15,7 +15,6 @@ #include "war_map.h" #include "locale_service.h" #include "config.h" -#include "dev_log.h" #include "db.h" #include "skill_power.h" @@ -199,11 +198,11 @@ static void FN_log_adminpage() while (iter != g_stAdminPageIP.end()) { - dev_log(LOG_DEB0, "ADMIN_PAGE_IP = %s", (*iter).c_str()); + sys_log(1, "ADMIN_PAGE_IP = %s", (*iter).c_str()); ++iter; } - dev_log(LOG_DEB0, "ADMIN_PAGE_PASSWORD = %s", g_stAdminPagePassword.c_str()); + sys_log(1, "ADMIN_PAGE_PASSWORD = %s", g_stAdminPagePassword.c_str()); } diff --git a/src/game/cube.cpp b/src/game/cube.cpp index c2378dd..9eb500d 100644 --- a/src/game/cube.cpp +++ b/src/game/cube.cpp @@ -12,7 +12,6 @@ #include "utils.h" #include "log.h" #include "char.h" -#include "dev_log.h" #include "locale_service.h" #include "item.h" #include "item_manager.h" @@ -298,7 +297,7 @@ void Cube_open (LPCHARACTER ch) if (NULL==npc) { if (test_server) - dev_log(LOG_DEB0, "cube_npc is NULL"); + sys_log(1, "cube_npc is NULL"); return; } @@ -306,7 +305,7 @@ void Cube_open (LPCHARACTER ch) { if ( test_server == true ) { - dev_log(LOG_DEB0, "cube not valid NPC"); + sys_log(1, "cube not valid NPC"); } return; } @@ -343,7 +342,7 @@ void Cube_close (LPCHARACTER ch) Cube_clean_item(ch); ch->SetCubeNpc(NULL); ch->ChatPacket(CHAT_TYPE_COMMAND, "cube close"); - dev_log(LOG_DEB0, " close (%s)", ch->GetName()); + sys_log(1, " close (%s)", ch->GetName()); } void Cube_init() @@ -439,7 +438,7 @@ bool Cube_load (const char *file) // TODO : check cube data if (false == FN_check_cube_data(cube_data)) { - dev_log(LOG_DEB0, "something wrong"); + sys_log(1, "something wrong"); M2_DELETE(cube_data); continue; } @@ -454,23 +453,23 @@ bool Cube_load (const char *file) static void FN_cube_print (CUBE_DATA *data, DWORD index) { DWORD i; - dev_log(LOG_DEB0, "--------------------------------"); - dev_log(LOG_DEB0, "CUBE_DATA[%d]", index); + sys_log(1, "--------------------------------"); + sys_log(1, "CUBE_DATA[%d]", index); for (i=0; inpc_vnum.size(); ++i) { - dev_log(LOG_DEB0, "\tNPC_VNUM[%d] = %d", i, data->npc_vnum[i]); + sys_log(1, "\tNPC_VNUM[%d] = %d", i, data->npc_vnum[i]); } for (i=0; iitem.size(); ++i) { - dev_log(LOG_DEB0, "\tITEM[%d] = (%d, %d)", i, data->item[i].vnum, data->item[i].count); + sys_log(1, "\tITEM[%d] = (%d, %d)", i, data->item[i].vnum, data->item[i].count); } for (i=0; ireward.size(); ++i) { - dev_log(LOG_DEB0, "\tREWARD[%d] = (%d, %d)", i, data->reward[i].vnum, data->reward[i].count); + sys_log(1, "\tREWARD[%d] = (%d, %d)", i, data->reward[i].vnum, data->reward[i].count); } - dev_log(LOG_DEB0, "\tPERCENT = %d", data->percent); - dev_log(LOG_DEB0, "--------------------------------"); + sys_log(1, "\tPERCENT = %d", data->percent); + sys_log(1, "--------------------------------"); } void Cube_print () diff --git a/src/game/desc_manager.cpp b/src/game/desc_manager.cpp index ed55d64..bf4fbf2 100644 --- a/src/game/desc_manager.cpp +++ b/src/game/desc_manager.cpp @@ -10,7 +10,6 @@ #include "protocol.h" #include "messenger_manager.h" #include "p2p.h" -#include "dev_log.h" #include "ClientPackageCryptInfo.h" DESC_MANAGER::DESC_MANAGER() : m_bDestroyed(false) @@ -168,13 +167,13 @@ LPDESC DESC_MANAGER::AcceptP2PDesc(LPFDWATCH fdw, socket_t bind_fd) void DESC_MANAGER::ConnectAccount(const std::string& login, LPDESC d) { -dev_log(LOG_DEB0, "BBBB ConnectAccount(%s)", login.c_str()); + sys_log(1, "BBBB ConnectAccount(%s)", login.c_str()); m_map_loginName.insert(DESC_LOGINNAME_MAP::value_type(login,d)); } void DESC_MANAGER::DisconnectAccount(const std::string& login) { -dev_log(LOG_DEB0, "BBBB DisConnectAccount(%s)", login.c_str()); + sys_log(1, "BBBB DisConnectAccount(%s)", login.c_str()); m_map_loginName.erase(login); } diff --git a/src/game/dev_log.cpp b/src/game/dev_log.cpp deleted file mode 100644 index 274dfd8..0000000 --- a/src/game/dev_log.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/********************************************************************* - * date : 2006.09.07 - * file : dev_log.cpp - * author : mhh - * description : - */ - -#define _dev_log_cpp_ - -#include "stdafx.h" -#include "dev_log.h" - -#ifndef IS_SET -# define IS_SET(flag,bit) ((flag) & (bit)) -#endif // IS_SET - -#ifndef SET_BIT -# define SET_BIT(var,bit) ((var) |= (bit)) -#endif // SET_BIT - -#ifndef REMOVE_BIT -# define REMOVE_BIT(var,bit) ((var) &= ~(bit)) -#endif // REMOVE_BIT - -#ifndef TOGGLE_BIT -# define TOGGLE_BIT(var,bit) ((var) = (var) ^ (bit)) -#endif // TOGGLE_BIT - -extern int test_server; -static int s_log_mask = 0xffffffff; - -void dev_log(const char *file, int line, const char *function, int level, const char *fmt, ...) -{ - // 테스트 서버에서만 남기며, 마스크가 꺼져있으면 남기지 않는다. - if (!test_server || !IS_SET(s_log_mask, level)) - return; - - static char buf[1024*1024]; // 1M - int fd; - char strtime[64+1]; - const char *strlevel; - struct timeval tv; - struct tm ltm; - int mon, day, hour, min, sec, usec; - int nlen; - va_list args; - - // --------------------------------------- - // open file - // --------------------------------------- -#ifndef OS_WINDOWS - fd = ::open("DEV_LOG.log", O_WRONLY|O_APPEND|O_CREAT, 0666); -#else - fd = ::_open("DEV_LOG.log", _O_WRONLY|_O_APPEND|_O_CREAT, 0666); -#endif - - if (fd < 0) - return; - - // --------------------------------------- - // set time string - // --------------------------------------- - gettimeofday (&tv, NULL); - - localtime_r((time_t*) &tv.tv_sec, <m); - - mon = ltm.tm_mon + 1; - day = ltm.tm_mday; - hour = ltm.tm_hour; - min = ltm.tm_min; - sec = ltm.tm_sec; - usec = tv.tv_usec; - - nlen = snprintf(strtime, sizeof(strtime), "%02d%02d %02d:%02d.%02d.%06d", mon, day, hour, min, sec, usec); - - if (nlen < 0 || nlen >= (int) sizeof(strtime)) - nlen = sizeof(strtime) - 1; - - strtime[nlen - 2] = '\0'; - - // --------------------------------------- - // get level string - // --------------------------------------- -#define GET_LEVEL_STRING(level) case L_##level : strlevel = #level; break - switch ( level ) { - GET_LEVEL_STRING ( WARN ); - GET_LEVEL_STRING ( ERR ); - GET_LEVEL_STRING ( CRIT ); - GET_LEVEL_STRING ( INFO ); - - GET_LEVEL_STRING ( MIN ); - GET_LEVEL_STRING ( MAX ); - - GET_LEVEL_STRING ( LIB0 ); - GET_LEVEL_STRING ( LIB1 ); - GET_LEVEL_STRING ( LIB2 ); - GET_LEVEL_STRING ( LIB3 ); - - GET_LEVEL_STRING ( DEB0 ); - GET_LEVEL_STRING ( DEB1 ); - GET_LEVEL_STRING ( DEB2 ); - GET_LEVEL_STRING ( DEB3 ); - - GET_LEVEL_STRING ( USR0 ); - GET_LEVEL_STRING ( USR1 ); - GET_LEVEL_STRING ( USR2 ); - GET_LEVEL_STRING ( USR3 ); - - default : strlevel = "UNKNOWN"; break; - } -#undef GET_LEVEL_STRING - - nlen = snprintf(buf, sizeof(buf), "%s %-4s (%-15s,%4d,%-24s) ", - strtime, strlevel, file, line, function); - - if (nlen < 0 || nlen >= (int) sizeof(buf)) - return; - - // --------------------------------------- - // write_log - // --------------------------------------- - va_start(args, fmt); - int vlen = vsnprintf(buf + nlen, sizeof(buf) - (nlen + 2), fmt, args); - va_end(args); - - if (vlen < 0 || vlen >= (int) sizeof(buf) - (nlen + 2)) - nlen += (sizeof(buf) - (nlen + 2)) - 1; - else - nlen += vlen; - - buf[nlen++] = '\n'; - buf[nlen] = 0; - - ::write(fd, buf, nlen); - ::close(fd); -} - -void dev_log_add_level(int level) -{ - SET_BIT(s_log_mask, level); -} - -void dev_log_del_level(int level) -{ - REMOVE_BIT(s_log_mask, level); -} - -void dev_log_set_level(int mask) -{ - s_log_mask = mask; -} - diff --git a/src/game/dev_log.h b/src/game/dev_log.h deleted file mode 100644 index a4e5afc..0000000 --- a/src/game/dev_log.h +++ /dev/null @@ -1,79 +0,0 @@ -/********************************************************************* - * date : 2006.09.07 - * file : dev_log.h - * author : mhh - * description : 개발자용 로그함수 테스트 서버에서만 기록된다. - * example) - * dev_log(LOG_DEB0, "My Name is %s", name); - */ - -#ifndef _dev_log_h_ -#define _dev_log_h_ - - -// ----------------------------------------------- -// define log level -// ----------------------------------------------- -#define L_WARN (1<<1) -#define L_ERR (1<<2) -#define L_CRIT (1<<3) -#define L_INFO (1<<4) - -#define L_MIN (1<<5) -#define L_MAX (1<<6) - -#define L_LIB0 (1<<7) -#define L_LIB1 (1<<8) -#define L_LIB2 (1<<9) -#define L_LIB3 (1<<10) - -#define L_DEB0 (1<<11) -#define L_DEB1 (1<<12) -#define L_DEB2 (1<<13) -#define L_DEB3 (1<<14) - - -#define L_USR0 (1<<15) -#define L_USR1 (1<<16) -#define L_USR2 (1<<17) -#define L_USR3 (1<<18) - - -// ----------------------------------------------- -// define log level -// ----------------------------------------------- -#define LOG_WARN __FILE__,__LINE__,__FUNCTION__,L_WARN -#define LOG_ERR __FILE__,__LINE__,__FUNCTION__,L_ERR -#define LOG_CRIT __FILE__,__LINE__,__FUNCTION__,L_CRIT -#define LOG_INFO __FILE__,__LINE__,__FUNCTION__,L_INFO - -#define LOG_MIN __FILE__,__LINE__,__FUNCTION__,L_MIN -#define LOG_MAX __FILE__,__LINE__,__FUNCTION__,L_MAX - -#define LOG_LIB0 __FILE__,__LINE__,__FUNCTION__,L_LIB0 -#define LOG_LIB1 __FILE__,__LINE__,__FUNCTION__,L_LIB1 -#define LOG_LIB2 __FILE__,__LINE__,__FUNCTION__,L_LIB2 -#define LOG_LIB3 __FILE__,__LINE__,__FUNCTION__,L_LIB3 - -#define LOG_DEB0 __FILE__,__LINE__,__FUNCTION__,L_DEB0 -#define LOG_DEB1 __FILE__,__LINE__,__FUNCTION__,L_DEB1 -#define LOG_DEB2 __FILE__,__LINE__,__FUNCTION__,L_DEB2 -#define LOG_DEB3 __FILE__,__LINE__,__FUNCTION__,L_DEB3 - - -#define LOG_USR0 __FILE__,__LINE__,__FUNCTION__,L_USR0 -#define LOG_USR1 __FILE__,__LINE__,__FUNCTION__,L_USR1 -#define LOG_USR2 __FILE__,__LINE__,__FUNCTION__,L_USR2 -#define LOG_USR3 __FILE__,__LINE__,__FUNCTION__,L_USR3 - - - - -void dev_log(const char *file, int line, const char *function, int level, const char *fmt, ...); -void dev_log_add_level(int level); -void dev_log_del_level(int level); -void dev_log_set_level(int mask); - - -#endif /* _dev_log_h_ */ - diff --git a/src/game/input.cpp b/src/game/input.cpp index bb05b8d..9779852 100644 --- a/src/game/input.cpp +++ b/src/game/input.cpp @@ -16,7 +16,6 @@ #include "TrafficProfiler.h" #include "priv_manager.h" #include "castle.h" -#include "dev_log.h" extern time_t get_global_time(); @@ -395,7 +394,7 @@ int CInputHandshake::Analyze(LPDESC d, BYTE bHeader, const char * c_pData) { std::string msg = stBuf.substr(3, LOGIN_MAX_LEN); -dev_log(LOG_DEB0, "DC : '%s'", msg.c_str()); + sys_log(1, "DC : '%s'", msg.c_str()); TPacketGGDisconnect pgg; diff --git a/src/game/input_db.cpp b/src/game/input_db.cpp index cca7cac..051ad2e 100644 --- a/src/game/input_db.cpp +++ b/src/game/input_db.cpp @@ -34,8 +34,6 @@ #include "castle.h" #include "motion.h" -#include "dev_log.h" - #include "log.h" #include "horsename_manager.h" diff --git a/src/game/input_login.cpp b/src/game/input_login.cpp index 9ac37e1..fc2b3d3 100644 --- a/src/game/input_login.cpp +++ b/src/game/input_login.cpp @@ -24,7 +24,6 @@ #include "arena.h" #include "OXEvent.h" #include "priv_manager.h" -#include "dev_log.h" #include "log.h" #include "horsename_manager.h" #include "MarkManager.h" diff --git a/src/game/input_p2p.cpp b/src/game/input_p2p.cpp index 1c50a78..051a98d 100644 --- a/src/game/input_p2p.cpp +++ b/src/game/input_p2p.cpp @@ -14,7 +14,6 @@ #include "xmas_event.h" #include "affect.h" #include "castle.h" -#include "dev_log.h" #include "locale_service.h" #include "questmanager.h" #include "skill.h" diff --git a/src/game/item.cpp b/src/game/item.cpp index f732ea3..c5c25f0 100644 --- a/src/game/item.cpp +++ b/src/game/item.cpp @@ -12,7 +12,6 @@ #include "profiler.h" #include "marriage.h" #include "item_addon.h" -#include "dev_log.h" #include "locale_service.h" #include "item.h" #include "item_manager.h" diff --git a/src/game/item_manager.cpp b/src/game/item_manager.cpp index 1358593..d667ca7 100644 --- a/src/game/item_manager.cpp +++ b/src/game/item_manager.cpp @@ -13,7 +13,6 @@ #include "unique_item.h" #include "safebox.h" #include "blend_item.h" -#include "dev_log.h" #include "locale_service.h" #include "item.h" #include "item_manager.h" diff --git a/src/game/item_manager_read_tables.cpp b/src/game/item_manager_read_tables.cpp index e115ff7..3e60697 100644 --- a/src/game/item_manager_read_tables.cpp +++ b/src/game/item_manager_read_tables.cpp @@ -13,7 +13,6 @@ #include "unique_item.h" #include "safebox.h" #include "blend_item.h" -#include "dev_log.h" #include "locale_service.h" #include "item.h" #include "item_manager.h" diff --git a/src/game/monarch.cpp b/src/game/monarch.cpp index a7cd07d..ec6765a 100644 --- a/src/game/monarch.cpp +++ b/src/game/monarch.cpp @@ -4,7 +4,6 @@ #include "char.h" #include "sectree_manager.h" #include "desc_client.h" -#include "dev_log.h" extern int test_server; extern int passes_per_sec; @@ -113,7 +112,7 @@ bool CMonarch::IsMonarch(DWORD pid, BYTE bEmpire) bool CMonarch::IsMoneyOk(int price, BYTE bEmpire) { - dev_log(LOG_DEB1, "GetMoney(%d), price = (%d,%d)", bEmpire, GetMoney(bEmpire), price); + sys_log(1, "GetMoney(%d), price = (%d,%d)", bEmpire, GetMoney(bEmpire), price); return (GetMoney(bEmpire) >= price); } diff --git a/src/game/questlua_monarch.cpp b/src/game/questlua_monarch.cpp index 3aa2107..8bbcff6 100644 --- a/src/game/questlua_monarch.cpp +++ b/src/game/questlua_monarch.cpp @@ -8,7 +8,6 @@ #include "config.h" #include "mob_manager.h" #include "castle.h" -#include "dev_log.h" #include "char.h" #include "char_manager.h" #include "utils.h" diff --git a/src/game/sectree_manager.cpp b/src/game/sectree_manager.cpp index c0253bf..7cbe3f1 100644 --- a/src/game/sectree_manager.cpp +++ b/src/game/sectree_manager.cpp @@ -16,7 +16,6 @@ #include "buffer_manager.h" #include "packet.h" #include "start_position.h" -#include "dev_log.h" WORD SECTREE_MANAGER::current_sectree_version = MAKEWORD(0, 3);