diff --git a/src/game/char.cpp b/src/game/char.cpp index 000b4ba..cd03edd 100644 --- a/src/game/char.cpp +++ b/src/game/char.cpp @@ -6175,16 +6175,6 @@ void CHARACTER::SetGuild(CGuild* pGuild) } } -void CHARACTER::SendGreetMessage() -{ - __typeof(DBManager::instance().GetGreetMessage()) v = DBManager::instance().GetGreetMessage(); - - for (itertype(v) it = v.begin(); it != v.end(); ++it) - { - ChatPacket(CHAT_TYPE_NOTICE, it->c_str()); - } -} - void CHARACTER::BeginStateEmpty() { MonsterLog("!"); diff --git a/src/game/char.h b/src/game/char.h index a20c736..386455b 100644 --- a/src/game/char.h +++ b/src/game/char.h @@ -741,7 +741,6 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider void ChatPacket(BYTE type, const char *format, ...); void ItemGetPacket(DWORD dwItemVnum, BYTE bCount, const char* szName = NULL, bool bIsDelivery = false); void MonsterChat(BYTE bMonsterChatType); - void SendGreetMessage(); void ResetPoint(int iLv); diff --git a/src/game/cmd_gm.cpp b/src/game/cmd_gm.cpp index faf8e4b..d605bdc 100644 --- a/src/game/cmd_gm.cpp +++ b/src/game/cmd_gm.cpp @@ -2098,11 +2098,6 @@ ACMD(do_reload) db_clientdesc->DBPacket(HEADER_GD_RELOAD_PROTO, 0, nullptr, 0); break; - case 's': - ch->ChatPacket(CHAT_TYPE_INFO, "Reloading notice string."); - DBManager::instance().LoadDBString(); - break; - case 'q': ch->ChatPacket(CHAT_TYPE_INFO, "Reloading quest."); quest::CQuestManager::instance().Reload(); @@ -2132,9 +2127,6 @@ ACMD(do_reload) ch->ChatPacket(CHAT_TYPE_INFO, "Reloading prototype tables,"); db_clientdesc->DBPacket(HEADER_GD_RELOAD_PROTO, 0, NULL, 0); - - ch->ChatPacket(CHAT_TYPE_INFO, "Reloading notice string."); - DBManager::instance().LoadDBString(); } } diff --git a/src/game/db.cpp b/src/game/db.cpp index 81a57c8..66233d4 100644 --- a/src/game/db.cpp +++ b/src/game/db.cpp @@ -35,11 +35,6 @@ bool DBManager::Connect(const char * host, const int port, const char * user, co if (!m_sql_direct.Setup(host, user, pwd, db, g_stLocale.c_str(), true, port)) sys_err("cannot open direct sql connection to host %s", host); - if (m_bIsConnect && !g_bAuthServer) - { - LoadDBString(); - } - return m_bIsConnect; } @@ -448,34 +443,6 @@ void DBManager::AnalyzeReturnQuery(SQLMsg * pMsg) } break; - case QID_DB_STRING: - { - m_map_dbstring.clear(); - m_vec_GreetMessage.clear(); - - for (uint i = 0; i < pMsg->Get()->uiNumRows; ++i) - { - MYSQL_ROW row = mysql_fetch_row(pMsg->Get()->pSQLResult); - //ch->SetSafeboxSize(SAFEBOX_PAGE_SIZE * atoi(row[0])); - if (row[0] && row[1]) - { - m_map_dbstring.insert(make_pair(std::string(row[0]), std::string(row[1]))); - sys_log(0, "DBSTR '%s' '%s'", row[0], row[1]); - } - } - if (m_map_dbstring.find("GREET") != m_map_dbstring.end()) - { - std::istringstream is(m_map_dbstring["GREET"]); - while (!is.eof()) - { - std::string str; - getline(is, str); - m_vec_GreetMessage.push_back(str); - } - } - } - break; - case QID_LOTTO: { LPCHARACTER ch = CHARACTER_MANAGER::instance().FindByPID(qi->dwIdent); @@ -572,25 +539,6 @@ void DBManager::AnalyzeReturnQuery(SQLMsg * pMsg) M2_DELETE(qi); } -void DBManager::LoadDBString() -{ - ReturnQuery(QID_DB_STRING, 0, NULL, "SELECT name, text FROM string%s", get_table_postfix()); -} - -const std::string& DBManager::GetDBString(const std::string& key) -{ - static std::string null_str = ""; - itertype(m_map_dbstring) it = m_map_dbstring.find(key); - if (it == m_map_dbstring.end()) - return null_str; - return it->second; -} - -const std::vector& DBManager::GetGreetMessage() -{ - return m_vec_GreetMessage; -} - void DBManager::SendMoneyLog(BYTE type, DWORD vnum, int gold) { if (!gold) diff --git a/src/game/db.h b/src/game/db.h index 16fb87c..4adb2a8 100644 --- a/src/game/db.h +++ b/src/game/db.h @@ -14,7 +14,6 @@ enum enum { QID_SAFEBOX_SIZE, - QID_DB_STRING, QID_AUTH_LOGIN, QID_LOTTO, QID_HIGHSCORE_REGISTER, @@ -93,10 +92,6 @@ class DBManager : public singleton DWORD CountQueryResult() { return m_sql.CountResult(); } void ResetQueryResult() { m_sql.ResetQueryFinished(); } - void LoadDBString(); - const std::string & GetDBString(const std::string& key); - const std::vector & GetGreetMessage(); - template void FuncQuery(Functor f, const char * c_pszFormat, ...); // 결과를 f인자로 호출함 (SQLMsg *) 알아서 해제됨 template void FuncAfterQuery(Functor f, const char * c_pszFormat, ...); // 끝나고 나면 f가 호출됨 void f(void) 형태 @@ -109,8 +104,6 @@ class DBManager : public singleton CAsyncSQL m_sql_direct; bool m_bIsConnect; - std::map m_map_dbstring; - std::vector m_vec_GreetMessage; std::map m_map_pkLoginData; std::vector m_vec_kUseTime; }; diff --git a/src/game/input.cpp b/src/game/input.cpp index 9779852..d1b78f6 100644 --- a/src/game/input.cpp +++ b/src/game/input.cpp @@ -432,7 +432,6 @@ int CInputHandshake::Analyze(LPDESC d, BYTE bHeader, const char * c_pData) { LoadStateUserCount(); db_clientdesc->DBPacket(HEADER_GD_RELOAD_PROTO, 0, NULL, 0); - DBManager::instance().LoadDBString(); } else { @@ -448,10 +447,6 @@ int CInputHandshake::Analyze(LPDESC d, BYTE bHeader, const char * c_pData) db_clientdesc->DBPacket(HEADER_GD_RELOAD_PROTO, 0, NULL, 0); break; - case 's': - DBManager::instance().LoadDBString(); - break; - case 'q': quest::CQuestManager::instance().Reload(); break; diff --git a/src/game/input_login.cpp b/src/game/input_login.cpp index 17c43db..5bc3a64 100644 --- a/src/game/input_login.cpp +++ b/src/game/input_login.cpp @@ -631,8 +631,6 @@ void CInputLogin::Entergame(LPDESC d, const char * data) p2.channel = g_bChannel; d->Packet(&p2, sizeof(p2)); - ch->SendGreetMessage(); - _send_bonus_info(ch); for (int i = 0; i <= PREMIUM_MAX_NUM; ++i)