diff --git a/src/engine/N3Base/N3UIString.cpp b/src/engine/N3Base/N3UIString.cpp index 25d212d7..92f5e561 100644 --- a/src/engine/N3Base/N3UIString.cpp +++ b/src/engine/N3Base/N3UIString.cpp @@ -472,7 +472,7 @@ void CN3UIString::ChangeFont(const std::string & szFont) { #endif int CN3UIString::GetStringRealWidth(int iNum) { - SIZE size; + SIZE size{}; BOOL bFlag = m_pDFont->GetTextExtent("가", lstrlen("가"), &size); __ASSERT(bFlag, "cannot get size of dfont"); int iLength = iNum / 2; @@ -482,6 +482,14 @@ int CN3UIString::GetStringRealWidth(int iNum) { return (size.cx * iLength); } +int CN3UIString::GetStringRealWidthRect() { + SIZE size{}; + BOOL bFlag = m_pDFont->GetTextExtent("가", lstrlen("가"), &size); + __ASSERT(bFlag, "cannot get size of dfont"); + + return (size.cy > 0) ? (m_rcRegion.bottom - m_rcRegion.top) / size.cy : 0; +} + void CN3UIString::SetStyle(DWORD dwType, DWORD dwStyleEx) { if (dwType == UI_STR_TYPE_LINE) { DWORD dwStyle = m_dwStyle; diff --git a/src/engine/N3Base/N3UIString.h b/src/engine/N3Base/N3UIString.h index 7c6fec6b..762638b3 100644 --- a/src/engine/N3Base/N3UIString.h +++ b/src/engine/N3Base/N3UIString.h @@ -37,6 +37,7 @@ class CN3UIString : public CN3UIBase { int GetLineCount() const { return m_iLineCount; } int GetStartLine() const { return m_iStartLine; } int GetStringRealWidth(int iNum); + int GetStringRealWidthRect(); virtual DWORD MouseProc(DWORD dwFlags, const POINT & ptCur, const POINT & ptOld); virtual void Render(); diff --git a/src/game/GameBase.cpp b/src/game/GameBase.cpp index cf3e80a4..c9a8c47f 100644 --- a/src/game/GameBase.cpp +++ b/src/game/GameBase.cpp @@ -28,6 +28,7 @@ CN3TableBase<__TABLE_PLAYER_LOOKS> * CGameBase::s_pTbl_NPC_Looks = CN3TableBase<__TABLE_QUEST_MENU> * CGameBase::s_pTbl_QuestMenu = NULL; // 퀘스트 선택 메뉴 CN3TableBase<__TABLE_QUEST_TALK> * CGameBase::s_pTbl_QuestTalk = NULL; // 퀘스트 지문 CN3TableBase<__TABLE_TEXTS> * CGameBase::s_pTbl_Texts = NULL; +CN3TableBase<__TABLE_HELP> * CGameBase::s_pTbl_Help = NULL; CN3WorldManager * CGameBase::s_pWorldMgr = NULL; // 월드 매니져.. CPlayerOtherMgr * CGameBase::s_pOPMgr = NULL; // Other Player Manager - 다른 유저 관리 클래스.. @@ -73,6 +74,7 @@ void CGameBase::StaticMemberInit() { s_pTbl_QuestMenu = new CN3TableBase<__TABLE_QUEST_MENU>; s_pTbl_QuestTalk = new CN3TableBase<__TABLE_QUEST_TALK>; s_pTbl_Texts = new CN3TableBase<__TABLE_TEXTS>; + s_pTbl_Help = new CN3TableBase<__TABLE_HELP>; std::string szLangTail = ".tbl"; int iLangID = ::GetUserDefaultLangID(); @@ -96,6 +98,8 @@ void CGameBase::StaticMemberInit() { s_pTbl_QuestTalk->LoadFromFile(szFN.c_str()); // 퀘스트 관련 지문 szFN = "Data\\Texts" + szLangTail; s_pTbl_Texts->LoadFromFile(szFN.c_str()); + szFN = "Data\\help" + szLangTail; + s_pTbl_Help->LoadFromFile(szFN.c_str()); for (int i = 0; i < MAX_ITEM_EXTENSION; i++) { char szFNTmp[256] = ""; @@ -146,6 +150,8 @@ void CGameBase::StaticMemberRelease() { s_pTbl_QuestTalk = NULL; // 퀘스트 관련 지문 delete s_pTbl_Texts; s_pTbl_Texts = NULL; + delete s_pTbl_Help; + s_pTbl_Help = NULL; delete s_pPlayer; s_pPlayer = NULL; // Player Character @@ -465,9 +471,10 @@ e_Class_Represent CGameBase::GetRepresentClass(e_Class eClass) { case CLASS_EL_CLERIC: case CLASS_EL_DRUID: return CLASS_REPRESENT_PRIEST; - } - return CLASS_REPRESENT_UNKNOWN; + default: + return CLASS_REPRESENT_GENERIC; + } } bool CGameBase::GetTextByNation(e_Nation eNation, std::string & szText) { diff --git a/src/game/GameBase.h b/src/game/GameBase.h index 1dda1bca..9beae60a 100644 --- a/src/game/GameBase.h +++ b/src/game/GameBase.h @@ -27,7 +27,8 @@ class CGameBase : public CN3Base { static CN3TableBase * s_pTbl_FXSource; // FX소스 정보 테이블.. static CN3TableBase * s_pTbl_QuestMenu; // 퀘스트 선택 메뉴 static CN3TableBase * s_pTbl_QuestTalk; // 퀘스트 지문 - static CN3TableBase * s_pTbl_Texts; + static CN3TableBase * s_pTbl_Texts; // Localized strings + static CN3TableBase * s_pTbl_Help; // Leveling Guide static class CN3WorldManager * s_pWorldMgr; // 월드 매니져 클래스.. static class CPlayerOtherMgr * s_pOPMgr; // Other Player Manager - 다른 유저 관리 클래스.. diff --git a/src/game/GameDef.h b/src/game/GameDef.h index 2b613231..84ab00e2 100644 --- a/src/game/GameDef.h +++ b/src/game/GameDef.h @@ -115,6 +115,7 @@ enum e_Class_Represent { CLASS_REPRESENT_ROGUE, CLASS_REPRESENT_WIZARD, CLASS_REPRESENT_PRIEST, + CLASS_REPRESENT_GENERIC = 100, CLASS_REPRESENT_UNKNOWN = 0xffffffff }; @@ -1275,6 +1276,15 @@ typedef struct __TABLE_QUEST_TALK { std::string szTalk; // 퀘스트 지문 } TABLE_QUEST_TALK; +typedef struct __TABLE_HELP { + int iID; + int iLevelMin; + int iLevelMax; + e_Class_Represent eRepresentClass; + std::string szTitle; + std::string szDescription; +} TABLE_HELP; + typedef struct __TABLE_TEXTS { DWORD dwID; std::string szText; diff --git a/src/game/GameProcMain.cpp b/src/game/GameProcMain.cpp index 2db07587..45d43e65 100644 --- a/src/game/GameProcMain.cpp +++ b/src/game/GameProcMain.cpp @@ -3889,11 +3889,10 @@ void CGameProcMain::InitUI() { m_pUILevelGuide->Init(s_pUIMgr); m_pUILevelGuide->LoadFromFile(pTbl->szLevelGuide); m_pUILevelGuide->SetVisibleWithNoSound(false); - m_pUILevelGuide->SetStyle(UISTYLE_USER_MOVE_HIDE); + m_pUILevelGuide->SetStyle(m_pUILevelGuide->GetStyle() | UISTYLE_POS_RIGHT); rc = m_pUILevelGuide->GetRegion(); - iX = (iW - (rc.right - rc.left)) / 2; - iY = (iH - (rc.bottom - rc.top)) / 2; - m_pUILevelGuide->SetPos(iX, iY); + m_pUILevelGuide->SetPos(iW - (rc.right - rc.left), 10); + m_pUILevelGuide->SetState(UI_STATE_COMMON_NONE); // dead ui m_pUIDead->Init(s_pUIMgr); @@ -4499,6 +4498,10 @@ bool CGameProcMain::CommandToggleUIInventory() { m_pUINotice->Close(); } + if (m_pUILevelGuide->IsVisible()) { + m_pUILevelGuide->SetVisible(false); + } + if (m_pUIInventory->IsVisible()) { m_pUIInventory->Close(true); return bNeedOpen; @@ -4536,6 +4539,9 @@ bool CGameProcMain::CommandToggleUISkillTree() { if (m_pUINotice->IsVisible()) { m_pUINotice->Close(); } + if (m_pUILevelGuide->IsVisible()) { + m_pUILevelGuide->SetVisible(false); + } s_pUIMgr->SetFocusedUI(m_pUISkillTreeDlg); m_pUISkillTreeDlg->Open(); @@ -4566,6 +4572,9 @@ bool CGameProcMain::CommandToggleUINotice() { if (m_pUISkillTreeDlg->IsVisible()) { m_pUISkillTreeDlg->Close(); } + if (m_pUILevelGuide->IsVisible()) { + m_pUILevelGuide->SetVisible(false); + } s_pUIMgr->SetFocusedUI(m_pUINotice); m_pUINotice->Open(); @@ -4576,6 +4585,39 @@ bool CGameProcMain::CommandToggleUINotice() { return bNeedOpen; } +bool CGameProcMain::CommandToggleUILevelGuide() { + bool bNeedOpen = !(m_pUILevelGuide->IsVisible()); + + if (m_pSubProcPerTrade->m_ePerTradeState != PER_TRADE_STATE_NONE) { + return bNeedOpen; + } + + if (bNeedOpen) { + if (m_pUIInventory->IsVisible()) { + m_pUIInventory->Close(); + } + if (m_pUITransactionDlg->IsVisible()) { + m_pUITransactionDlg->LeaveTransactionState(); + } + if (m_pUIWareHouseDlg->IsVisible()) { + m_pUIWareHouseDlg->LeaveWareHouseState(); + } + if (m_pUISkillTreeDlg->IsVisible()) { + m_pUISkillTreeDlg->Close(); + } + if (m_pUINotice->IsVisible()) { + m_pUINotice->SetVisible(false); + } + + s_pUIMgr->SetFocusedUI(m_pUILevelGuide); + m_pUILevelGuide->SetVisible(true); + } else { + m_pUILevelGuide->SetVisible(false); + } + + return bNeedOpen; +} + bool CGameProcMain::CommandToggleUIMiniMap() { return m_pUIStateBarAndMiniMap->ToggleMiniMap(); } diff --git a/src/game/GameProcMain.h b/src/game/GameProcMain.h index d5845563..f6ddc0e7 100644 --- a/src/game/GameProcMain.h +++ b/src/game/GameProcMain.h @@ -225,6 +225,7 @@ class CGameProcMain : public CGameProcedure { bool CommandToggleUISkillTree(); bool CommandToggleUIMiniMap(); bool CommandToggleUINotice(); + bool CommandToggleUILevelGuide(); void CommandMove(e_MoveDirection eMD, bool bStartOrEnd); // 움직이는 방향(전후진, 멈춤), 움직이기 시작하는가? void CommandEnableAttackContinous(bool bEnable, CPlayerBase * pTarget); diff --git a/src/game/UILevelGuide.cpp b/src/game/UILevelGuide.cpp index bb7392e1..37dd88bb 100644 --- a/src/game/UILevelGuide.cpp +++ b/src/game/UILevelGuide.cpp @@ -1,69 +1,81 @@ #include "StdAfx.h" - #include "UILevelGuide.h" + +#include "Resource.h" +#include "GameProcMain.h" +#include "PlayerMySelf.h" +#include "UIManager.h" + #include "N3Base/N3UIString.h" #include "N3Base/N3UIScrollBar.h" +#include "N3Base/N3UIEdit.h" + +const int MAX_SEARCH_ABOVE_LEVEL = 5; CUILevelGuide::CUILevelGuide() { - for (size_t i = 0; i < MAX_GUIDE_PAGE; ++i) { - m_pText_Titles[i] = NULL; - m_pText_Guides[i] = NULL; - m_pScroll_Guides[i] = NULL; - } - m_pBtn_Check = NULL; m_pEdit_Level = NULL; + + m_pBtn_Check = NULL; + m_pBtn_Cancel = NULL; + m_pBtn_Up = NULL; + m_pBtn_Down = NULL; + m_pText_Page = NULL; m_pText_Level = NULL; m_iCurrPage = 0; -} -CUILevelGuide::~CUILevelGuide() { - m_QuestList.clear(); + for (size_t i = 0; i < MAX_QUESTS_PER_PAGE; ++i) { + m_pText_Titles[i] = NULL; + m_pText_Guides[i] = NULL; + m_pScroll_Guides[i] = NULL; + } } +CUILevelGuide::~CUILevelGuide() = default; + bool CUILevelGuide::Load(HANDLE hFile) { if (!CN3UIBase::Load(hFile)) { return false; } - m_pBtn_Check = (CN3UIButton *)(this->GetChildByID("btn_check")); + m_pBtn_Check = (CN3UIButton *)GetChildByID("btn_check"); __ASSERT(m_pBtn_Check, "NULL UI Component!!"); - m_pBtn_Cancel = (CN3UIButton *)(this->GetChildByID("btn_cancel")); + m_pBtn_Cancel = (CN3UIButton *)GetChildByID("btn_cancel"); __ASSERT(m_pBtn_Cancel, "NULL UI Component!!"); - m_pBtn_Up = (CN3UIButton *)(this->GetChildByID("btn_up")); + m_pBtn_Up = (CN3UIButton *)GetChildByID("btn_up"); __ASSERT(m_pBtn_Up, "NULL UI Component!!"); - m_pBtn_Down = (CN3UIButton *)(this->GetChildByID("btn_down")); + m_pBtn_Down = (CN3UIButton *)GetChildByID("btn_down"); __ASSERT(m_pBtn_Down, "NULL UI Component!!"); - m_pEdit_Level = (CN3UIEdit *)(this->GetChildByID("edit_level")); + m_pEdit_Level = (CN3UIEdit *)GetChildByID("edit_level"); __ASSERT(m_pEdit_Level, "NULL UI Component!!"); - m_pText_Page = (CN3UIString *)(this->GetChildByID("text_page")); + m_pText_Page = (CN3UIString *)GetChildByID("text_page"); __ASSERT(m_pText_Page, "NULL UI Component!!"); - m_pText_Level = (CN3UIString *)(this->GetChildByID("text_level")); + m_pText_Level = (CN3UIString *)GetChildByID("text_level"); __ASSERT(m_pText_Level, "NULL UI Component!!"); - for (size_t i = 0; i < MAX_GUIDE_PAGE; ++i) { + for (size_t i = 0; i < MAX_QUESTS_PER_PAGE; ++i) { std::string indexStr = std::to_string(i); - m_pText_Titles[i] = (CN3UIString *)(this->GetChildByID("text_title" + indexStr)); + m_pText_Titles[i] = (CN3UIString *)GetChildByID("text_title" + indexStr); __ASSERT(m_pText_Titles[i], "NULL UI Component!!"); if (m_pText_Titles[i]) { m_pText_Titles[i]->SetString(""); } - m_pText_Guides[i] = (CN3UIString *)(this->GetChildByID("text_guide" + indexStr)); + m_pText_Guides[i] = (CN3UIString *)GetChildByID("text_guide" + indexStr); __ASSERT(m_pText_Guides[i], "NULL UI Component!!"); if (m_pText_Guides[i]) { m_pText_Guides[i]->SetString(""); } - m_pScroll_Guides[i] = (CN3UIScrollBar *)(this->GetChildByID("scroll_guide" + indexStr)); + m_pScroll_Guides[i] = (CN3UIScrollBar *)GetChildByID("scroll_guide" + indexStr); __ASSERT(m_pScroll_Guides[i], "NULL UI Component!!"); if (m_pScroll_Guides[i]) { m_pScroll_Guides[i]->SetVisible(false); @@ -84,21 +96,21 @@ bool CUILevelGuide::ReceiveMessage(CN3UIBase * pSender, DWORD dwMsg) { if (dwMsg == UIMSG_BUTTON_CLICK) { if (pSender == (CN3UIBase *)m_pBtn_Check) { - Check(); + CheckAvailableQuests(); return true; } else if (pSender == (CN3UIBase *)m_pBtn_Cancel) { SetVisible(false); return true; } else if (pSender == (CN3UIBase *)m_pBtn_Up) { - MovePage(m_iCurrPage + 1); + ChangePage(m_iCurrPage + 1); return true; } else if (pSender == (CN3UIBase *)m_pBtn_Down) { - MovePage(m_iCurrPage - 1); + ChangePage(m_iCurrPage - 1); return true; } } else if (dwMsg == UIMSG_SCROLLBAR_POS) { int iIndex = -1; - for (size_t i = 0; i < MAX_GUIDE_PAGE; ++i) { + for (size_t i = 0; i < MAX_QUESTS_PER_PAGE; ++i) { if (pSender == (CN3UIBase *)m_pScroll_Guides[i]) { iIndex = i; break; @@ -114,10 +126,134 @@ bool CUILevelGuide::ReceiveMessage(CN3UIBase * pSender, DWORD dwMsg) { return true; } -void CUILevelGuide::Check() { - N3_WARN("[CUILevelGuide::Check] TODO: needs implementing."); +void CUILevelGuide::SetVisible(bool bVisible) { + if (m_bVisible == bVisible) { + return; + } + + if (bVisible) { + UpdateQuestsByLevel(CGameBase::s_pPlayer->m_InfoBase.iLevel); + if (m_pEdit_Level) { + m_pEdit_Level->SetString(""); + m_pEdit_Level->SetFocus(); + } + } else { + if (m_pEdit_Level) { + m_pEdit_Level->SetString(""); + m_pEdit_Level->KillFocus(); + } + } + + CN3UIBase::SetVisible(bVisible); + if (bVisible) { + CGameProcedure::s_pUIMgr->SetVisible(this); + } else { + CGameProcedure::s_pUIMgr->ReFocusUI(); + } } -void CUILevelGuide::MovePage(int iIndex) { - N3_WARN("[CUILevelGuide::MovePage] TODO: needs implementing."); +void CUILevelGuide::UpdateQuestsByLevel(int iLevel) { + if (iLevel >= 0 && CGameBase::s_pPlayer->m_InfoBase.iLevel + MAX_SEARCH_ABOVE_LEVEL >= iLevel) { + m_QuestList.clear(); + e_Class_Represent eRepClass = CGameBase::GetRepresentClass(CGameBase::s_pPlayer->m_InfoBase.eClass); + + size_t iQuestsCount = CGameBase::s_pTbl_Help->GetSize(); + if (iQuestsCount > 0) { + for (size_t i = 0; i < iQuestsCount; ++i) { + __TABLE_HELP * pQuest = CGameBase::s_pTbl_Help->Find(i); + if (!pQuest) { + continue; + } + + if (pQuest->eRepresentClass == CLASS_REPRESENT_GENERIC || pQuest->eRepresentClass == eRepClass) { + if (pQuest->iLevelMin == iLevel && pQuest->iLevelMax == iLevel) { + m_QuestList.push_front(pQuest); + } else if (pQuest->iLevelMin <= iLevel && pQuest->iLevelMax >= iLevel) { + m_QuestList.push_back(pQuest); + } + } + } + } + } + + if (m_pText_Level) { + m_pText_Level->SetStringAsInt(iLevel); + } + ChangePage(0); +} + +void CUILevelGuide::ChangePage(int iIndex) { + if (iIndex < 0) { + return; + } + + if (m_QuestList.size() <= 0 || iIndex * MAX_QUESTS_PER_PAGE < m_QuestList.size()) { + for (size_t i = 0; i < MAX_QUESTS_PER_PAGE; ++i) { + if (m_pText_Titles[i]) { + m_pText_Titles[i]->SetString(""); + } + if (m_pText_Guides[i]) { + m_pText_Guides[i]->SetString(""); + } + if (m_pScroll_Guides[i]) { + m_pScroll_Guides[i]->SetVisible(false); + } + } + } + + if (m_QuestList.size() > 0 && iIndex * MAX_QUESTS_PER_PAGE < m_QuestList.size()) { + auto itr = std::next(m_QuestList.begin(), iIndex * MAX_QUESTS_PER_PAGE); + for (size_t i = 0; i < MAX_QUESTS_PER_PAGE && itr != m_QuestList.end(); ++i, ++itr) { + __TABLE_HELP * pQuest = (*itr); + if (!pQuest) { + continue; + } + + if (m_pText_Titles[i]) { + m_pText_Titles[i]->SetString(pQuest->szTitle); + } + if (m_pText_Guides[i]) { + m_pText_Guides[i]->SetString(pQuest->szDescription); + if (m_pText_Guides[i]->GetLineCount() > m_pText_Guides[i]->GetStringRealWidthRect()) { + if (m_pScroll_Guides[i]) { + m_pScroll_Guides[i]->SetVisible(true); + int iScroll = m_pText_Guides[i]->GetLineCount() - m_pText_Guides[i]->GetStringRealWidthRect(); + if (iScroll < 0) { + iScroll = 0; + } + m_pScroll_Guides[i]->SetRange(0, iScroll); + m_pScroll_Guides[i]->SetCurrentPos(0); + } + } else if (m_pScroll_Guides[i]) { + m_pScroll_Guides[i]->SetVisible(false); + } + } + } + m_iCurrPage = iIndex; + if (m_pText_Page) { + m_pText_Page->SetStringAsInt(iIndex + 1); + } + } +} + +void CUILevelGuide::CheckAvailableQuests() { + int iLevelFilter = std::atol(m_pEdit_Level->GetString().c_str()); + if (iLevelFilter <= 0) { + return; + } + + if (CGameBase::s_pPlayer->m_InfoBase.iLevel + MAX_SEARCH_ABOVE_LEVEL < iLevelFilter) { + std::string szMsgFormat; + ::_LoadStringFromResource(IDS_LEVELGUIDE_SEARCH_WARNING, szMsgFormat); + + char szMsg[70]{}; + sprintf(szMsg, szMsgFormat.c_str(), MAX_SEARCH_ABOVE_LEVEL); + CGameProcedure::MessageBoxPost(szMsg, "", MB_OK, BEHAVIOR_NOTHING); + + iLevelFilter = CGameBase::s_pPlayer->m_InfoBase.iLevel + MAX_SEARCH_ABOVE_LEVEL; + } + + UpdateQuestsByLevel(iLevelFilter); + m_pEdit_Level->SetString(""); + m_pEdit_Level->SetFocus(); } diff --git a/src/game/UILevelGuide.h b/src/game/UILevelGuide.h index 5bd75679..e730e94e 100644 --- a/src/game/UILevelGuide.h +++ b/src/game/UILevelGuide.h @@ -3,30 +3,37 @@ #include "N3Base/N3UIBase.h" #include -const int MAX_GUIDE_PAGE = 3; +const int MAX_QUESTS_PER_PAGE = 3; class CUILevelGuide : public CN3UIBase { public: CUILevelGuide(); - virtual ~CUILevelGuide(); + ~CUILevelGuide() override; - bool Load(HANDLE hFile); - bool ReceiveMessage(CN3UIBase * pSender, DWORD dwMsg); + bool Load(HANDLE hFile) override; + bool ReceiveMessage(CN3UIBase * pSender, DWORD dwMsg) override; + void SetVisible(bool bVisible) override; - void Check(); - void MovePage(int iIndex); + void UpdateQuestsByLevel(int iLevel); + void ChangePage(int iIndex); + void CheckAvailableQuests(); public: - CN3UIEdit * m_pEdit_Level; - CN3UIButton * m_pBtn_Check; - CN3UIButton * m_pBtn_Cancel; - CN3UIButton * m_pBtn_Up; - CN3UIButton * m_pBtn_Down; - CN3UIString * m_pText_Titles[MAX_GUIDE_PAGE]; - CN3UIString * m_pText_Guides[MAX_GUIDE_PAGE]; - CN3UIString * m_pText_Page; - CN3UIString * m_pText_Level; - CN3UIScrollBar * m_pScroll_Guides[MAX_GUIDE_PAGE]; - std::list m_QuestList; - int m_iCurrPage; + CN3UIEdit * m_pEdit_Level; + + CN3UIButton * m_pBtn_Check; + CN3UIButton * m_pBtn_Cancel; + CN3UIButton * m_pBtn_Up; + CN3UIButton * m_pBtn_Down; + + CN3UIString * m_pText_Titles[MAX_QUESTS_PER_PAGE]; + CN3UIString * m_pText_Guides[MAX_QUESTS_PER_PAGE]; + CN3UIString * m_pText_Page; + CN3UIString * m_pText_Level; + + CN3UIScrollBar * m_pScroll_Guides[MAX_QUESTS_PER_PAGE]; + + std::list m_QuestList; + + int m_iCurrPage; }; diff --git a/src/game/UIStateBar.cpp b/src/game/UIStateBar.cpp index e8ad226b..8610e675 100644 --- a/src/game/UIStateBar.cpp +++ b/src/game/UIStateBar.cpp @@ -648,7 +648,10 @@ bool CUIStateBar::ReceiveMessage(CN3UIBase * pSender, DWORD dwMsg) { } else if (dwMsg == UIMSG_BUTTON_CLICK) { if (pSender == (CN3UIBase *)m_pBtn_Quest) { if (CGameProcedure::s_pProcMain->m_pUILevelGuide) { - CGameProcedure::s_pProcMain->m_pUILevelGuide->SetVisible(true); + // Note that officialy they call SetVisible, however @xGuTeK's implementation + // here is much friendlier, making the Quest button toggling the leveling guide. + //CGameProcedure::s_pProcMain->m_pUILevelGuide->SetVisible(true); + CGameProcedure::s_pProcMain->CommandToggleUILevelGuide(); } m_bQuestButtonClicked = true; return true; diff --git a/src/game/res/Resource.h b/src/game/res/Resource.h index d751cdd2..6385c509 100644 --- a/src/game/res/Resource.h +++ b/src/game/res/Resource.h @@ -514,6 +514,7 @@ #define IDS_DEAD_REVIVAL_MESSAGE 6603 #define IDS_DEAD_LOW_LEVEL 6604 #define IDS_INVEN_WEIGHT 6605 +#define IDS_LEVELGUIDE_SEARCH_WARNING 10100 #define IDS_NATIONSELECT_MSGBOX_SELECTION 10420 #define IDS_NATIONSELECT_DESCRIPTION_KA 10421 #define IDS_NATIONSELECT_DESCRIPTION_EL 10422