Modified GM Textail

#add ENABLE_MODIFIED_GM_NAME
bbyte0 308d3113 +26 -0



root/colorinfo.py:
find:
CHR_NAME_RGB_EMPIRE_PC_C = (23, 30, 138)
CHR_NAME_RGB_MOUNT = (122, 231, 93)
CHR_NAME_RGB_PET = (122, 231, 93)

add after:
CHR_NAME_RGB_GM = (255, 255, 167)



root/introloading.py
in     def __RegisterColor(self):
find:
            chrmgr.NAMECOLOR_EMPIRE_PC+3 : colorInfo.CHR_NAME_RGB_EMPIRE_PC_C,
            chrmgr.NAMECOLOR_MOUNT : colorInfo.CHR_NAME_RGB_MOUNT,
            chrmgr.NAMECOLOR_PET : colorInfo.CHR_NAME_RGB_PET,
add after:
            chrmgr.NAMECOLOR_GM : colorInfo.CHR_NAME_RGB_GM,



client-src/UserInterface/Defines.h:
add:
#define ENABLE_MODIFIED_GM_NAME



client-src/UserInterface/InstanceBase.h:
find:
            NAMECOLOR_METIN,
            NAMECOLOR_MOUNT,
            NAMECOLOR_PET,
add after:
#ifdef ENABLE_MODIFIED_GM_NAME
            NAMECOLOR_GM,
#endif



client-src/UserInterface/InstanceBaseEffect.cpp:
find:
UINT CInstanceBase::GetNameColorIndex()
{
    if (IsPC())
    {
add after:
#ifdef ENABLE_MODIFIED_GM_NAME
        if (IsGameMaster())
            return NAMECOLOR_GM;
#endif

find:
in void CInstanceBase::RefreshTextTail()
    int iAlignmentGrade = GetAlignmentGrade();
    if (TITLE_NONE == iAlignmentGrade)
    {
        CPythonTextTail::Instance().DetachTitle(GetVirtualID());
    }
    else
    {
        std::map<int, std::string>::iterator itor = g_TitleNameMap.find(iAlignmentGrade);
        if (g_TitleNameMap.end() != itor)
        {
            const std::string & c_rstrTitleName = itor->second;
            CPythonTextTail::Instance().AttachTitle(GetVirtualID(), c_rstrTitleName.c_str(), GetTitleColor());
        }
    }
replace with:
#ifdef ENABLE_MODIFIED_GM_NAME
    if (false == IsGameMaster())
    {
        int iAlignmentGrade = GetAlignmentGrade();
        if (TITLE_NONE == iAlignmentGrade)
        {
            CPythonTextTail::Instance().DetachTitle(GetVirtualID());
        }
        else
        {
            std::map<int, std::string>::iterator itor = g_TitleNameMap.find(iAlignmentGrade);
            if (g_TitleNameMap.end() != itor)
            {
                const std::string& c_rstrTitleName = itor->second;
                CPythonTextTail::Instance().AttachTitle(GetVirtualID(), c_rstrTitleName.c_str(), GetTitleColor());
            }
        }
    }
#else
    int iAlignmentGrade = GetAlignmentGrade();
    if (TITLE_NONE == iAlignmentGrade)
    {
        CPythonTextTail::Instance().DetachTitle(GetVirtualID());
    }
    else
    {
        std::map<int, std::string>::iterator itor = g_TitleNameMap.find(iAlignmentGrade);
        if (g_TitleNameMap.end() != itor)
        {
            const std::string & c_rstrTitleName = itor->second;
            CPythonTextTail::Instance().AttachTitle(GetVirtualID(), c_rstrTitleName.c_str(), GetTitleColor());
        }
    }
#endif



client-src/UserInterface/PythonCharacterManagerModule.cpp:
find:
    PyModule_AddIntConstant(poModule, "NAMECOLOR_METIN",                        CInstanceBase::NAMECOLOR_METIN);
    PyModule_AddIntConstant(poModule, "NAMECOLOR_MOUNT",                        CInstanceBase::NAMECOLOR_MOUNT);
    PyModule_AddIntConstant(poModule, "NAMECOLOR_PET",                            CInstanceBase::NAMECOLOR_PET);
add after:
#ifdef ENABLE_MODIFIED_GM_NAME
    PyModule_AddIntConstant(poModule, "NAMECOLOR_GM",                            CInstanceBase::NAMECOLOR_GM);
#endif



client-src/UserInterface/PythonTextTail.cpp:
find:
void CPythonTextTail::RegisterCharacterTextTail(DWORD dwGuildID, DWORD dwVirtualID, const D3DXCOLOR & c_rColor, float fAddHeight)
{
    CInstanceBase * pCharacterInstance = CPythonCharacterManager::Instance().GetInstancePtr(dwVirtualID);

    if (!pCharacterInstance)
        return;

    TTextTail * pTextTail = RegisterTextTail(dwVirtualID,
                                             pCharacterInstance->GetNameString(),
                                             pCharacterInstance->GetGraphicThingInstancePtr(),
                                             pCharacterInstance->GetGraphicThingInstanceRef().GetHeight() + fAddHeight,
                                             c_rColor);

    CGraphicTextInstance * pTextInstance = pTextTail->pTextInstance;
    pTextInstance->SetOutline(true);
    pTextInstance->SetVerticalAlign(CGraphicTextInstance::VERTICAL_ALIGN_BOTTOM);
add after:
#ifdef ENABLE_MODIFIED_GM_NAME
    if (CInstanceBase* ch = CPythonCharacterManager::Instance().GetInstancePtr(dwVirtualID))
        if (ch->IsGameMaster())
            pTextInstance->SetOutLineColor(0xFFFF7D00);
#endif

find in void CPythonTextTail::AttachLevel(DWORD dwVID, const char * c_szText, const D3DXCOLOR & c_rColor)
    prLevel->SetValue(c_szText);
    prLevel->SetColor(c_rColor.r, c_rColor.g, c_rColor.b);
replace with:
#ifdef ENABLE_MODIFIED_GM_NAME
    if (CInstanceBase* ch = CPythonCharacterManager::Instance().GetInstancePtr(dwVID))
    {
        if (ch->IsGameMaster())
        {
            prLevel->SetValue("[GM] ");
            prLevel->SetColor(0xFFFFFFA7);
            prLevel->SetOutLineColor(0xFFFF7D00);
        }
        else
        {
            prLevel->SetValue(c_szText);
            prLevel->SetColor(c_rColor.r, c_rColor.g, c_rColor.b);
        }
    }
#else
    prLevel->SetValue(c_szText);
    prLevel->SetColor(c_rColor.r, c_rColor.g, c_rColor.b);
#endif