diff --git a/src/source/CSParts.cpp b/src/source/CSParts.cpp index 42d0cece3..abadaa736 100644 --- a/src/source/CSParts.cpp +++ b/src/source/CSParts.cpp @@ -163,11 +163,11 @@ void DeleteParts(CHARACTER* c) if (c->m_pParts != nullptr) { - SAFE_DELETE(c->m_pParts); + delete static_cast(c->m_pParts); c->m_pParts = nullptr; c->EtcPart = 0; } - SAFE_DELETE(c->m_pTempParts); + delete static_cast(c->m_pTempParts); c->m_pTempParts = nullptr; } CSParts::CSParts(int Type, int BoneNumber, bool bBillBoard, float x, float y, float z, float ax, float ay, float az) diff --git a/src/source/CharMakeWin.cpp b/src/source/CharMakeWin.cpp index fc3b3ce21..8ddccd4dc 100644 --- a/src/source/CharMakeWin.cpp +++ b/src/source/CharMakeWin.cpp @@ -461,7 +461,7 @@ void CCharMakeWin::RenderControls() void CCharMakeWin::SelectCreateCharacter() { CharacterView.Class = m_nSelJob; - CreateCharacterPointer(&CharacterView, MODEL_FACE + CharacterView.Class, 0, 0); + CreateCharacterPointer(&CharacterView, static_cast(MODEL_FACE) + CharacterView.Class, 0, 0); CharacterView.Object.Kind = 0; SetAction(&CharacterView.Object, 1); } diff --git a/src/source/ExternalObject/Leaf/xstreambuf.cpp b/src/source/ExternalObject/Leaf/xstreambuf.cpp index 4fe7d74d7..5edf1f058 100644 --- a/src/source/ExternalObject/Leaf/xstreambuf.cpp +++ b/src/source/ExternalObject/Leaf/xstreambuf.cpp @@ -30,7 +30,7 @@ xstreambuf::xstreambuf(const xstreambuf& xbuf) } xstreambuf::~xstreambuf() { - delete[] m_pBuffer; + delete[] static_cast(m_pBuffer); } void xstreambuf::seek(unsigned int n, XBUF_POS pos) @@ -70,7 +70,7 @@ xstreambuf& xstreambuf::read(void* dest, unsigned int n) void xstreambuf::clear() { - delete[] m_pBuffer; + delete[] static_cast(m_pBuffer); init(); } @@ -110,7 +110,7 @@ void xstreambuf::resize(size_t s) cpysize = size(); memcpy(temp, m_pBuffer, cpysize); - delete[] m_pBuffer; + delete[] static_cast(m_pBuffer); } m_pBuffer = temp; m_capacity = buf_size; diff --git a/src/source/GMBattleCastle.cpp b/src/source/GMBattleCastle.cpp index ed105b5d8..aaf5a0c50 100644 --- a/src/source/GMBattleCastle.cpp +++ b/src/source/GMBattleCastle.cpp @@ -431,9 +431,9 @@ namespace battleCastle bool GetGuildMaster(CHARACTER* c) { - if (wcscmp(GuildMark[c->GuildMarkIndex].GuildName, L"") == NULL) return false; - if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, L"") == NULL && c->GuildStatus != G_MASTER) return false; - if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, GuildMark[c->GuildMarkIndex].GuildName) == NULL && c->GuildStatus != G_MASTER) return false; + if (wcscmp(GuildMark[c->GuildMarkIndex].GuildName, L"") == 0) return false; + if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, L"") == 0 && c->GuildStatus != G_MASTER) return false; + if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, GuildMark[c->GuildMarkIndex].GuildName) == 0 && c->GuildStatus != G_MASTER) return false; return true; } @@ -498,7 +498,7 @@ namespace battleCastle if (o->Live && o->Visible) { DeleteParts(c); - if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, GuildName) == NULL) + if (wcscmp(GuildMark[c->GuildMarkIndex].UnionName, GuildName) == 0) { // _buffwani_ g_TokenCharacterBuff(o, eBuff_CastleRegimentDefense); diff --git a/src/source/GMCrywolf1st.cpp b/src/source/GMCrywolf1st.cpp index 5ebd9c8a3..ad8b6fc33 100644 --- a/src/source/GMCrywolf1st.cpp +++ b/src/source/GMCrywolf1st.cpp @@ -33,7 +33,7 @@ char Suc_Or_Fail = -1; char View_Suc_Or_Fail = -1; float Deco_Insert = 0.f; char Message_Box = 0; -wchar_t Box_String[2][200] = { NULL,NULL }; +wchar_t Box_String[2][200] = {}; int Dark_elf_Num = 0; int Button_Down = 0; int BackUp_Key = 0; @@ -2180,7 +2180,7 @@ void M34CryWolf1st::Set_Message_Box(int Str, int Num, int Key, int ObjNum) else Message_Box = 2; if (Num == 0) - Box_String[Num + 1][0] = NULL; + Box_String[Num + 1][0] = 0; BackUp_Key = Key; } @@ -2321,14 +2321,14 @@ void M34CryWolf1st::Sub_Interface() g_pCryWolfInterface->Render(Yes, 250, 54, 30, 0.f, 0.f, 54.f / 64.f, 30.f / 32.f, 19); } - if (Box_String[0][0] != NULL) + if (Box_String[0][0] != 0) { int Y_loc = 239; - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) Y_loc = 227; g_pRenderText->RenderText(317, Y_loc, Box_String[0], 0, 0, RT3_WRITE_CENTER); } - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) g_pRenderText->RenderText(317, 238, Box_String[1], 0, 0, RT3_WRITE_CENTER); } else if (Message_Box == 2) @@ -2354,14 +2354,14 @@ void M34CryWolf1st::Sub_Interface() g_pCryWolfInterface->Render(290, 250, 54, 30, 0.f, 0.f, 54.f / 64.f, 30.f / 32.f, 16); } - if (Box_String[0][0] != NULL) + if (Box_String[0][0] != 0) { int Y_loc = 239; - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) Y_loc = 227; g_pRenderText->RenderText(317, Y_loc, Box_String[0], 0, 0, RT3_WRITE_CENTER); } - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) g_pRenderText->RenderText(317, 238, Box_String[1], 0, 0, RT3_WRITE_CENTER); } } diff --git a/src/source/GameShop/MsgBoxIGSBuyConfirm.cpp b/src/source/GameShop/MsgBoxIGSBuyConfirm.cpp index b82b18c2a..e71ec6e66 100644 --- a/src/source/GameShop/MsgBoxIGSBuyConfirm.cpp +++ b/src/source/GameShop/MsgBoxIGSBuyConfirm.cpp @@ -242,4 +242,4 @@ bool CMsgBoxIGSBuyConfirmLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSCommon.cpp b/src/source/GameShop/MsgBoxIGSCommon.cpp index 8711fa306..b3cc6b939 100644 --- a/src/source/GameShop/MsgBoxIGSCommon.cpp +++ b/src/source/GameShop/MsgBoxIGSCommon.cpp @@ -117,7 +117,7 @@ void CMsgBoxIGSCommon::SetAddCallbackFunc() void CMsgBoxIGSCommon::SetButtonInfo() { - m_BtnOk.SetInfo(IMAGE_IGS_BUTTON, GetPos().x + (IMAGE_IGS_FRAME_WIDTH / 2) - (IMAGE_IGS_BTN_WIDTH / 2), (GetPos().y + m_iMsgBoxHeight) - (IMAGE_IGS_BTN_HEIGHT + IGS_BTN_POS_Y), IMAGE_IGS_BTN_WIDTH, IMAGE_IGS_BTN_HEIGHT, CNewUIMessageBoxButton::MSGBOX_BTN_CUSTOM, true); + m_BtnOk.SetInfo(IMAGE_IGS_BUTTON, GetPos().x + (IMAGE_IGS_FRAME_WIDTH / 2) - (IMAGE_IGS_BTN_WIDTH / 2), (GetPos().y + m_iMsgBoxHeight) - (static_cast(IMAGE_IGS_BTN_HEIGHT) + IGS_BTN_POS_Y), IMAGE_IGS_BTN_WIDTH, IMAGE_IGS_BTN_HEIGHT, CNewUIMessageBoxButton::MSGBOX_BTN_CUSTOM, true); m_BtnOk.MoveTextPos(0, -1); m_BtnOk.SetText(GlobalText[228]); } @@ -200,4 +200,4 @@ bool CMsgBoxIGSCommonLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSDeleteItemConfirm.cpp b/src/source/GameShop/MsgBoxIGSDeleteItemConfirm.cpp index 0e9a52e0c..4c4bebccf 100644 --- a/src/source/GameShop/MsgBoxIGSDeleteItemConfirm.cpp +++ b/src/source/GameShop/MsgBoxIGSDeleteItemConfirm.cpp @@ -272,4 +272,4 @@ bool CMsgBoxIGSDeleteItemConfirmLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSGiftStorageItemInfo.cpp b/src/source/GameShop/MsgBoxIGSGiftStorageItemInfo.cpp index cbb689f22..e779f33a1 100644 --- a/src/source/GameShop/MsgBoxIGSGiftStorageItemInfo.cpp +++ b/src/source/GameShop/MsgBoxIGSGiftStorageItemInfo.cpp @@ -328,4 +328,4 @@ bool CMsgBoxIGSGiftStorageItemInfoLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSSendGift.cpp b/src/source/GameShop/MsgBoxIGSSendGift.cpp index 2d63246c5..d62f253c8 100644 --- a/src/source/GameShop/MsgBoxIGSSendGift.cpp +++ b/src/source/GameShop/MsgBoxIGSSendGift.cpp @@ -314,4 +314,4 @@ bool CMsgBoxIGSSendGiftLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSSendGiftConfirm.cpp b/src/source/GameShop/MsgBoxIGSSendGiftConfirm.cpp index 8b896e878..c58abf340 100644 --- a/src/source/GameShop/MsgBoxIGSSendGiftConfirm.cpp +++ b/src/source/GameShop/MsgBoxIGSSendGiftConfirm.cpp @@ -259,4 +259,4 @@ bool CMsgBoxIGSSendGiftConfirmLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSStorageItemInfo.cpp b/src/source/GameShop/MsgBoxIGSStorageItemInfo.cpp index deb99635d..3ed8fba1f 100644 --- a/src/source/GameShop/MsgBoxIGSStorageItemInfo.cpp +++ b/src/source/GameShop/MsgBoxIGSStorageItemInfo.cpp @@ -237,4 +237,4 @@ bool CMsgBoxIGSStorageItemInfoLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSUseBuffConfirm.cpp b/src/source/GameShop/MsgBoxIGSUseBuffConfirm.cpp index 90c5d0da6..7c8913764 100644 --- a/src/source/GameShop/MsgBoxIGSUseBuffConfirm.cpp +++ b/src/source/GameShop/MsgBoxIGSUseBuffConfirm.cpp @@ -231,4 +231,4 @@ bool CMsgBoxIGSUseBuffConfirmLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/GameShop/MsgBoxIGSUseItemConfirm.cpp b/src/source/GameShop/MsgBoxIGSUseItemConfirm.cpp index ac17863bc..f62501397 100644 --- a/src/source/GameShop/MsgBoxIGSUseItemConfirm.cpp +++ b/src/source/GameShop/MsgBoxIGSUseItemConfirm.cpp @@ -309,4 +309,4 @@ bool CMsgBoxIGSUseItemConfirmLayout::SetLayout() return true; } -#endif KJH_ADD_INGAMESHOP_UI_SYSTEM \ No newline at end of file +#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM diff --git a/src/source/Guild/NewUIGuildInfoWindow.cpp b/src/source/Guild/NewUIGuildInfoWindow.cpp index 1ee8d04f8..032c5a184 100644 --- a/src/source/Guild/NewUIGuildInfoWindow.cpp +++ b/src/source/Guild/NewUIGuildInfoWindow.cpp @@ -356,7 +356,7 @@ bool SEASON3B::CNewUIGuildInfoWindow::Check_Mouse(int mx, int my) case static_cast(GuildConstants::GuildTab::UNION): { if (m_bRequestUnionList == false - && GuildMark[Hero->GuildMarkIndex].UnionName[0] != NULL) + && GuildMark[Hero->GuildMarkIndex].UnionName[0] != 0) { SocketClient->ToGameServer()->SendRequestAllianceList(); m_bRequestUnionList = true; @@ -609,7 +609,7 @@ void SEASON3B::CNewUIGuildInfoWindow::Render_Text() m_Button[BUTTON_UNION_OUT].SetPos(m_Pos.x + 100, m_Pos.y + 230); m_Button[BUTTON_UNION_CREATE].ChangeText(GlobalText[1422]); m_Button[BUTTON_UNION_OUT].ChangeText(GlobalText[1324]); - if (GuildMark[Hero->GuildMarkIndex].UnionName[0] != NULL) + if (GuildMark[Hero->GuildMarkIndex].UnionName[0] != 0) { RenderText((wchar_t*)GlobalText[182], m_Pos.x + 34, m_Pos.y + 115, 40, 0, 0xFFFFFFFF, 0x00000000, RT3_SORT_LEFT); RenderText((wchar_t*)GlobalText[1330], m_Pos.x + 140, m_Pos.y + 115, 40, 0, 0xFFFFFFFF, 0x00000000, RT3_SORT_LEFT); @@ -764,7 +764,7 @@ void SEASON3B::CNewUIGuildInfoWindow::Render_Guild_Info() { POINT ptOrigin = { m_Pos.x + 15, m_Pos.y + 98 }; - if (GuildMark[Hero->GuildMarkIndex].UnionName[0] == NULL) + if (GuildMark[Hero->GuildMarkIndex].UnionName[0] == 0) { ptOrigin.x += 10; ptOrigin.y += 8; @@ -964,8 +964,8 @@ void SEASON3B::CNewUIGuildInfoWindow::NoticeClear() void SEASON3B::CNewUIGuildInfoWindow::SetRivalGuildName(wchar_t* szName) { - memcpy(m_RivalGuildName, szName, sizeof(char) * MAX_GUILDNAME); - m_RivalGuildName[MAX_GUILDNAME] = NULL; + wcsncpy(m_RivalGuildName, szName, MAX_GUILDNAME); + m_RivalGuildName[MAX_GUILDNAME] = 0; } void SEASON3B::CNewUIGuildInfoWindow::AddUnionList(BYTE* pGuildMark, wchar_t* szGuildName, int nMemberCount) diff --git a/src/source/Guild/UIGuildInfo.cpp b/src/source/Guild/UIGuildInfo.cpp index d3cf1be33..b6f6867b9 100644 --- a/src/source/Guild/UIGuildInfo.cpp +++ b/src/source/Guild/UIGuildInfo.cpp @@ -20,7 +20,7 @@ extern int DeleteGuildIndex; extern DWORD g_dwActiveUIID; wchar_t s_szTargetID[MAX_USERNAME_SIZE + 1]; -extern int s_nTargetFireMemberIndex = 0; +int s_nTargetFireMemberIndex = 0; char Guild_Skill_Button = 0; @@ -470,7 +470,7 @@ void CUIGuildInfo::RenderGuildUnionTab() { POINT ptOrigin = { GetPosition_x() + 15, GetPosition_y() + 98 }; - if (GuildMark[Hero->GuildMarkIndex].UnionName[0] == NULL) + if (GuildMark[Hero->GuildMarkIndex].UnionName[0] == 0) { ptOrigin.x += 10; ptOrigin.y += 8; @@ -530,8 +530,8 @@ void CUIGuildInfo::RenderGuildUnionTab() void CUIGuildInfo::SetRivalGuildName(wchar_t* szName) { - memcpy(m_szRivalGuildName, szName, sizeof(char) * MAX_GUILDNAME); - m_szRivalGuildName[MAX_GUILDNAME] = NULL; + wcsncpy(m_szRivalGuildName, szName, MAX_GUILDNAME); + m_szRivalGuildName[MAX_GUILDNAME] = 0; } void CUIGuildInfo::AddGuildNotice(wchar_t* szText) diff --git a/src/source/LoadData.cpp b/src/source/LoadData.cpp index 5f34ef506..29c0992f0 100644 --- a/src/source/LoadData.cpp +++ b/src/source/LoadData.cpp @@ -39,7 +39,7 @@ void CLoadData::AccessModel(int Type, const wchar_t* Dir, const wchar_t* FileNam Success = Models[Type].Open2(Dir, Name); - if (Success == false && (wcscmp(FileName, L"Monster") == NULL || wcscmp(FileName, L"Player") == NULL || wcscmp(FileName, L"PlayerTest") == NULL || wcscmp(FileName, L"Angel") == NULL)) + if (Success == false && (wcscmp(FileName, L"Monster") == 0 || wcscmp(FileName, L"Player") == 0 || wcscmp(FileName, L"PlayerTest") == 0 || wcscmp(FileName, L"Angel") == 0)) { wchar_t Text[256]; mu_swprintf(Text, L"%ls file does not exist.", Name); diff --git a/src/source/NewBloodCastleSystem.cpp b/src/source/NewBloodCastleSystem.cpp index 1eeb7ce96..3ff76eb84 100644 --- a/src/source/NewBloodCastleSystem.cpp +++ b/src/source/NewBloodCastleSystem.cpp @@ -134,7 +134,7 @@ void CNewBloodCastleSystem::RenderMatchResult(void) g_pRenderText->SetTextColor(128, 255, 128, 255); g_pRenderText->SetBgColor(0, 0, 0, 0); - wchar_t lpszStr[256] = { NULL, }; + wchar_t lpszStr[256] = {}; if (m_iNumResult) { diff --git a/src/source/NewChaosCastleSystem.cpp b/src/source/NewChaosCastleSystem.cpp index 3d53a84d9..e4761c4ce 100644 --- a/src/source/NewChaosCastleSystem.cpp +++ b/src/source/NewChaosCastleSystem.cpp @@ -173,7 +173,7 @@ void CNewChaosCastleSystem::RenderMatchResult(void) { int x = REFERENCE_WIDTH / 2; int yPos = m_PosResult.y + 40; - wchar_t lpszStr[256] = { NULL, }; + wchar_t lpszStr[256] = {}; EnableAlphaTest(); diff --git a/src/source/NewUIBattleSoccerScore.cpp b/src/source/NewUIBattleSoccerScore.cpp index f54f7caab..3d0caa1ef 100644 --- a/src/source/NewUIBattleSoccerScore.cpp +++ b/src/source/NewUIBattleSoccerScore.cpp @@ -149,7 +149,7 @@ int SEASON3B::CNewUIBattleSoccerScore::FindGuildMark(wchar_t* pszGuildName) for (int i = 0; i < MARK_EDIT; ++i) { MARK_t* p = &GuildMark[i]; - if (wcscmp(p->GuildName, pszGuildName) == NULL) + if (wcscmp(p->GuildName, pszGuildName) == 0) { return i; } diff --git a/src/source/NewUIBloodCastleTime.cpp b/src/source/NewUIBloodCastleTime.cpp index 1c3b3e312..f85cd99c9 100644 --- a/src/source/NewUIBloodCastleTime.cpp +++ b/src/source/NewUIBloodCastleTime.cpp @@ -99,7 +99,7 @@ bool CNewUIBloodCastle::Render() EnableAlphaTest(); glColor4f(1.f, 1.f, 1.f, 1.f); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; g_pRenderText->SetFont(g_hFont); g_pRenderText->SetBgColor(0); diff --git a/src/source/NewUIChaosCastleTime.cpp b/src/source/NewUIChaosCastleTime.cpp index de0dc3fb2..70b489853 100644 --- a/src/source/NewUIChaosCastleTime.cpp +++ b/src/source/NewUIChaosCastleTime.cpp @@ -92,7 +92,7 @@ bool CNewUIChaosCastleTime::Render() EnableAlphaTest(); glColor4f(1.f, 1.f, 1.f, 1.f); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; g_pRenderText->SetFont(g_hFont); g_pRenderText->SetBgColor(0); diff --git a/src/source/NewUICharacterInfoWindow.cpp b/src/source/NewUICharacterInfoWindow.cpp index 53940d13d..661aebf2d 100644 --- a/src/source/NewUICharacterInfoWindow.cpp +++ b/src/source/NewUICharacterInfoWindow.cpp @@ -1340,11 +1340,11 @@ void SEASON3B::CNewUICharacterInfoWindow::RenderAttribute() if ((pWeaponRight->Type >= MODEL_STAFF - MODEL_ITEM && pWeaponRight->Type < (MODEL_STAFF + MAX_ITEM_INDEX - MODEL_ITEM)) - || pWeaponRight->Type == (MODEL_RUNE_BLADE - MODEL_ITEM) - || pWeaponRight->Type == (MODEL_EXPLOSION_BLADE - MODEL_ITEM) - || pWeaponRight->Type == (MODEL_SWORD_DANCER - MODEL_ITEM) - || pWeaponRight->Type == (MODEL_DARK_REIGN_BLADE - MODEL_ITEM) - || pWeaponRight->Type == (MODEL_IMPERIAL_SWORD - MODEL_ITEM) + || pWeaponRight->Type == (static_cast(MODEL_RUNE_BLADE) - MODEL_ITEM) + || pWeaponRight->Type == (static_cast(MODEL_EXPLOSION_BLADE) - MODEL_ITEM) + || pWeaponRight->Type == (static_cast(MODEL_SWORD_DANCER) - MODEL_ITEM) + || pWeaponRight->Type == (static_cast(MODEL_DARK_REIGN_BLADE) - MODEL_ITEM) + || pWeaponRight->Type == (static_cast(MODEL_IMPERIAL_SWORD) - MODEL_ITEM) ) { float magicPercent = (float)(pWeaponRight->MagicPower) / 100; diff --git a/src/source/NewUICommandWindow.cpp b/src/source/NewUICommandWindow.cpp index e6b4b2098..cd01468af 100644 --- a/src/source/NewUICommandWindow.cpp +++ b/src/source/NewUICommandWindow.cpp @@ -65,7 +65,7 @@ void SEASON3B::CNewUICommandWindow::Release() void SEASON3B::CNewUICommandWindow::InitButtons() { - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[927], L"D"); m_BtnExit.ChangeButtonImgState(true, IMAGE_COMMAND_BASE_WINDOW_BTN_EXIT); @@ -474,7 +474,7 @@ bool SEASON3B::CNewUICommandWindow::CommandPurchase(CHARACTER* pSelectedCha) bool SEASON3B::CNewUICommandWindow::CommandParty(SHORT iChaKey) { - if (PartyNumber > 0 && wcscmp(Party[0].Name, Hero->ID) != NULL) + if (PartyNumber > 0 && wcscmp(Party[0].Name, Hero->ID) != 0) { g_pSystemLogBox->AddText(GlobalText[257], SEASON3B::TYPE_ERROR_MESSAGE); return false; diff --git a/src/source/NewUICryWolf.cpp b/src/source/NewUICryWolf.cpp index fa2d57b6a..84240cb4d 100644 --- a/src/source/NewUICryWolf.cpp +++ b/src/source/NewUICryWolf.cpp @@ -423,14 +423,14 @@ bool SEASON3B::CNewUICryWolf::Render() g_pCryWolfInterface->Render(Yes, 250, 54, 30, 0.f, 0.f, 53.f / 64.f, 30.f / 32.f, 19); } - if (Box_String[0][0] != NULL) + if (Box_String[0][0] != 0) { int Y_loc = 239; - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) Y_loc = 227; g_pRenderText->RenderText(317, Y_loc, Box_String[0], 0, 0, RT3_WRITE_CENTER); } - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) { g_pRenderText->RenderText(317, 238, Box_String[1], 0, 0, RT3_WRITE_CENTER); } @@ -458,15 +458,15 @@ bool SEASON3B::CNewUICryWolf::Render() g_pCryWolfInterface->Render(290, 250, 54, 30, 0.f, 0.f, 53.f / 64.f, 30.f / 32.f, 16); } - if (Box_String[0][0] != NULL) + if (Box_String[0][0] != 0) { int Y_loc = 239; - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) Y_loc = 227; g_pRenderText->RenderText(317, Y_loc, Box_String[0], 0, 0, RT3_WRITE_CENTER); } - if (Box_String[1][0] != NULL) + if (Box_String[1][0] != 0) { g_pRenderText->RenderText(317, 238, Box_String[1], 0, 0, RT3_WRITE_CENTER); } diff --git a/src/source/NewUICursedTempleSystem.cpp b/src/source/NewUICursedTempleSystem.cpp index 159e7c0bf..a40e62ccc 100644 --- a/src/source/NewUICursedTempleSystem.cpp +++ b/src/source/NewUICursedTempleSystem.cpp @@ -779,7 +779,7 @@ void SEASON3B::CNewUICursedTempleSystem::RenderSkill() ZeroMemory(TextListColor, 20 * sizeof(int)); for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } wchar_t skillname[100]; @@ -805,7 +805,7 @@ void SEASON3B::CNewUICursedTempleSystem::RenderSkill() ZeroMemory(TextListColor, 20 * sizeof(int)); for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } mu_swprintf(TextList[TextNum], L"%ls", GlobalText[2378]); @@ -822,7 +822,7 @@ void SEASON3B::CNewUICursedTempleSystem::RenderSkill() ZeroMemory(TextListColor, 20 * sizeof(int)); for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } mu_swprintf(TextList[TextNum], L"%ls", GlobalText[2377]); @@ -1035,7 +1035,7 @@ void SEASON3B::CNewUICursedTempleSystem::RenderTutorialStep() ZeroMemory(TextListColor, 20 * sizeof(int)); for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } if (m_TutorialStepState == 0) diff --git a/src/source/NewUIDoppelGangerFrame.cpp b/src/source/NewUIDoppelGangerFrame.cpp index 9b82a45be..e3b4bd1ee 100644 --- a/src/source/NewUIDoppelGangerFrame.cpp +++ b/src/source/NewUIDoppelGangerFrame.cpp @@ -88,7 +88,7 @@ bool CNewUIDoppelGangerFrame::Render() RenderImage(IMAGE_DOPPELGANGER_FRAME_WINDOW, m_Pos.x, m_Pos.y, float(DOPPELGANGER_FRAME_WINDOW_WIDTH), float(DOPPELGANGER_FRAME_WINDOW_HEIGHT)); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; g_pRenderText->SetFont(g_hFont); g_pRenderText->SetBgColor(0); diff --git a/src/source/NewUIEmpireGuardianTimer.cpp b/src/source/NewUIEmpireGuardianTimer.cpp index 17bbc06bc..2cce5cbbc 100644 --- a/src/source/NewUIEmpireGuardianTimer.cpp +++ b/src/source/NewUIEmpireGuardianTimer.cpp @@ -83,7 +83,7 @@ bool CNewUIEmpireGuardianTimer::Render() RenderImage(IMAGE_EMPIREGUARDIAN_TIMER_WINDOW, m_Pos.x, m_Pos.y, float(TIMER_WINDOW_WIDTH), float(TIMER_WINDOW_HEIGHT)); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; g_pRenderText->SetFont(g_hFont); g_pRenderText->SetBgColor(0); diff --git a/src/source/NewUIGroup.cpp b/src/source/NewUIGroup.cpp index add3ec550..261426ca3 100644 --- a/src/source/NewUIGroup.cpp +++ b/src/source/NewUIGroup.cpp @@ -1,7 +1,6 @@ //============================================================================= // NewUIGroup.cpp //============================================================================= -#pragma once #include "stdafx.h" #include "NewUIGroup.h" diff --git a/src/source/NewUIHeroPositionInfo.cpp b/src/source/NewUIHeroPositionInfo.cpp index 88d805a98..acb2ce793 100644 --- a/src/source/NewUIHeroPositionInfo.cpp +++ b/src/source/NewUIHeroPositionInfo.cpp @@ -177,7 +177,7 @@ bool CNewUIHeroPositionInfo::Update() bool CNewUIHeroPositionInfo::Render() { - wchar_t szText[255] = { NULL, }; + wchar_t szText[255] = {}; EnableAlphaTest(); glColor4f(1.f, 1.f, 1.f, 1.f); diff --git a/src/source/NewUIItemEnduranceInfo.cpp b/src/source/NewUIItemEnduranceInfo.cpp index d072fa9df..a60b75a89 100644 --- a/src/source/NewUIItemEnduranceInfo.cpp +++ b/src/source/NewUIItemEnduranceInfo.cpp @@ -91,7 +91,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::UpdateMouseEvent() if (CheckMouseIn(m_UIStartPos.x, iNextPosY, PETHP_FRAME_WIDTH, PETHP_FRAME_HEIGHT)) return false; - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } if (gCharacterManager.GetBaseClass(Hero->Class) == CLASS_DARK_LORD) @@ -101,7 +101,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::UpdateMouseEvent() if (CheckMouseIn(m_UIStartPos.x, iNextPosY, PETHP_FRAME_WIDTH, PETHP_FRAME_HEIGHT)) return false; - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } } @@ -112,7 +112,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::UpdateMouseEvent() if (CheckMouseIn(m_UIStartPos.x, iNextPosY, PETHP_FRAME_WIDTH, PETHP_FRAME_HEIGHT)) return false; - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } } @@ -200,12 +200,12 @@ bool SEASON3B::CNewUIItemEnduranceInfo::UpdateMouseEvent() if (bRenderRingWarning == false) { icntItemDurIcon++; - ItemDurPos.y += (ITEM_DUR_HEIGHT + UI_INTERVAL_WIDTH); + ItemDurPos.y += (static_cast(ITEM_DUR_HEIGHT) + UI_INTERVAL_WIDTH); if (icntItemDurIcon % 2 == 0) { ItemDurPos.y = m_ItemDurUIStartPos.y; - ItemDurPos.x -= (ITEM_DUR_WIDTH + UI_INTERVAL_WIDTH); + ItemDurPos.x -= (static_cast(ITEM_DUR_WIDTH) + UI_INTERVAL_WIDTH); } } } @@ -272,14 +272,14 @@ void SEASON3B::CNewUIItemEnduranceInfo::RenderLeft() if (RenderEquipedHelperLife(m_UIStartPos.x, iNextPosY)) { - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } if (gCharacterManager.GetBaseClass(Hero->Class) == CLASS_DARK_LORD) { if (RenderEquipedPetLife(m_UIStartPos.x, iNextPosY)) { - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } } @@ -287,7 +287,7 @@ void SEASON3B::CNewUIItemEnduranceInfo::RenderLeft() { if (RenderSummonMonsterLife(m_UIStartPos.x, iNextPosY)) { - iNextPosY += (UI_INTERVAL_HEIGHT + PETHP_FRAME_HEIGHT); + iNextPosY += (static_cast(UI_INTERVAL_HEIGHT) + PETHP_FRAME_HEIGHT); } } } @@ -385,7 +385,7 @@ void SEASON3B::CNewUIItemEnduranceInfo::RenderTooltip(int iX, int iY, const ITEM int iLevel = pItem->Level; int iMaxDurability = CalcMaxDurability(pItem, pItemAtt, iLevel); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, L"%ls (%d/%d)", pItemAtt->Name, pItem->Durability, iMaxDurability); GetTextExtentPoint32(g_pRenderText->GetFontDC(), szText, 1, &TextSize); @@ -415,7 +415,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::RenderEquipedHelperLife(int iX, int iY) || Hero->Helper.Type == MODEL_PET_SKELETON || Hero->Helper.Type == MODEL_HORN_OF_FENRIR) { - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; switch (Hero->Helper.Type) { @@ -497,7 +497,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::RenderEquipedPetLife(int iX, int iY) if (Hero->m_pPet == NULL) return false; - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[1214]); int iLife = CharacterMachine->Equipment[EQUIPMENT_WEAPON_LEFT].Durability; @@ -511,7 +511,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::RenderSummonMonsterLife(int iX, int iY) if (SummonLife <= 0) return false; - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[356]); RenderHPUI(iX, iY, szText, SummonLife, 100); @@ -524,7 +524,7 @@ bool SEASON3B::CNewUIItemEnduranceInfo::RenderNumArrow(int iX, int iY) if (m_iCurArrowType == ARROWTYPE_NONE) return false; - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; int iNumEquipedArrowDurability = 0; int iNumArrowSetInInven = 0; @@ -686,12 +686,12 @@ bool SEASON3B::CNewUIItemEnduranceInfo::RenderItemEndurance(int ix, int iY) if (bRenderRingWarning == false) { icntItemDurIcon++; - ItemDurPos.y += (ITEM_DUR_HEIGHT + UI_INTERVAL_WIDTH); + ItemDurPos.y += (static_cast(ITEM_DUR_HEIGHT) + UI_INTERVAL_WIDTH); if (icntItemDurIcon % 2 == 0) { ItemDurPos.y = m_ItemDurUIStartPos.y; - ItemDurPos.x -= (ITEM_DUR_WIDTH + UI_INTERVAL_WIDTH); + ItemDurPos.x -= (static_cast(ITEM_DUR_WIDTH) + UI_INTERVAL_WIDTH); } } } diff --git a/src/source/NewUIMainFrameWindow.cpp b/src/source/NewUIMainFrameWindow.cpp index caf940e73..0f7bdc341 100644 --- a/src/source/NewUIMainFrameWindow.cpp +++ b/src/source/NewUIMainFrameWindow.cpp @@ -2269,7 +2269,7 @@ void SEASON3B::CNewUISkillList::RenderSkillIcon(int iIndex, float x, float y, fl || bySkillType == AT_SKILL_EARTHSHAKE_STR || bySkillType == AT_SKILL_EARTHSHAKE_MASTERY || bySkillType == AT_SKILL_RIDER - || (bySkillType >= AT_PET_COMMAND_DEFAULT && bySkillType <= AT_PET_COMMAND_TARGET) + || (static_cast(bySkillType) >= static_cast(AT_PET_COMMAND_DEFAULT) && static_cast(bySkillType) <= static_cast(AT_PET_COMMAND_TARGET)) ) { bCantSkill = true; @@ -2323,10 +2323,10 @@ void SEASON3B::CNewUISkillList::RenderSkillIcon(int iIndex, float x, float y, fl bCantSkill = true; } - if (bySkillType >= AT_PET_COMMAND_DEFAULT && bySkillType <= AT_PET_COMMAND_END) + if (static_cast(bySkillType) >= static_cast(AT_PET_COMMAND_DEFAULT) && static_cast(bySkillType) <= static_cast(AT_PET_COMMAND_END)) { - fU = ((bySkillType - AT_PET_COMMAND_DEFAULT) % 8) * width / 256.f; - fV = ((bySkillType - AT_PET_COMMAND_DEFAULT) / 8) * height / 256.f; + fU = ((static_cast(bySkillType) - AT_PET_COMMAND_DEFAULT) % 8) * width / 256.f; + fV = ((static_cast(bySkillType) - AT_PET_COMMAND_DEFAULT) / 8) * height / 256.f; iKindofSkill = KOS_COMMAND; } else if (bySkillType == AT_SKILL_PLASMA_STORM_FENRIR) diff --git a/src/source/NewUIMuHelper.cpp b/src/source/NewUIMuHelper.cpp index 590e35b55..f1ea4c50d 100644 --- a/src/source/NewUIMuHelper.cpp +++ b/src/source/NewUIMuHelper.cpp @@ -2964,8 +2964,7 @@ void CNewUIMuHelperExt::Reset() { int iSkillIndex = m_iCurrentPage == SUB_PAGE_SKILL2_CONFIG ? 1 : 2; - _TempConfig.aiSkillCondition[iSkillIndex] = ON_MOBS_NEARBY | ON_MORE_THAN_TWO_MOBS; - _TempConfig.aiSkillCondition[iSkillIndex] = ON_MOBS_NEARBY | ON_MORE_THAN_TWO_MOBS; + _TempConfig.aiSkillCondition[iSkillIndex] = static_cast(ON_MOBS_NEARBY) | ON_MORE_THAN_TWO_MOBS; m_BtnPreConHuntRange.RegisterBoxState(_TempConfig.aiSkillCondition[iSkillIndex] & ON_MOBS_NEARBY); m_BtnPreConAttacking.RegisterBoxState(_TempConfig.aiSkillCondition[iSkillIndex] & ON_MOBS_ATTACKING); diff --git a/src/source/NewUISeigeWarfare.cpp b/src/source/NewUISeigeWarfare.cpp index 8ae2831c7..190eae79c 100644 --- a/src/source/NewUISeigeWarfare.cpp +++ b/src/source/NewUISeigeWarfare.cpp @@ -196,8 +196,8 @@ bool SEASON3B::CNewUISiegeWarfare::CreateMiniMapUI() }break; case G_MASTER: { - if (wcscmp(GuildMark[m_sGuildMarkIndex].UnionName, L"") == NULL - || wcscmp(GuildMark[m_sGuildMarkIndex].GuildName, GuildMark[m_sGuildMarkIndex].UnionName) == NULL) + if (wcscmp(GuildMark[m_sGuildMarkIndex].UnionName, L"") == 0 + || wcscmp(GuildMark[m_sGuildMarkIndex].GuildName, GuildMark[m_sGuildMarkIndex].UnionName) == 0) { m_pSiegeWarUI = new CNewUISiegeWarCommander; // Commander m_iCurSiegeWarType = SIEGEWAR_TYPE_COMMANDER; diff --git a/src/source/NewUISiegeWarBase.cpp b/src/source/NewUISiegeWarBase.cpp index 6e1beb645..d74a83667 100644 --- a/src/source/NewUISiegeWarBase.cpp +++ b/src/source/NewUISiegeWarBase.cpp @@ -52,7 +52,7 @@ bool SEASON3B::CNewUISiegeWarBase::Create(int x, int y) if (!OnCreate(x, y)) return false; - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, L"%d", (int)(m_fMiniMapAlpha * 100.5f)); m_BtnAlpha.ChangeText(szText); m_BtnAlpha.ChangeButtonImgState(true, IMAGE_BTN_ALPHA, true); @@ -309,7 +309,7 @@ bool SEASON3B::CNewUISiegeWarBase::BtnProcess() m_fMiniMapAlpha = m_fMiniMapAlpha - 0.1f; } - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, L"%d", (int)(m_fMiniMapAlpha * 100.5f)); m_BtnAlpha.ChangeText(szText); m_BtnAlpha.ChangeAlpha(m_fMiniMapAlpha); @@ -443,7 +443,7 @@ void SEASON3B::CNewUISiegeWarBase::RenderSkillIcon() int iSelectSkill; int iCurKillCount; - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; iUseSkillDestKill = SkillAttribute[Hero->GuildSkill].KillCount; diff --git a/src/source/NewUITextBox.cpp b/src/source/NewUITextBox.cpp index aa4dadf7a..b8f6b9504 100644 --- a/src/source/NewUITextBox.cpp +++ b/src/source/NewUITextBox.cpp @@ -1,7 +1,6 @@ //============================================================================= // NewUITextBox.cpp //============================================================================= -#pragma once #include "stdafx.h" #include "NewUITextBox.h" #include "UIControls.h" diff --git a/src/source/PersonalShopTitleImp.cpp b/src/source/PersonalShopTitleImp.cpp index 12481d858..97d529665 100644 --- a/src/source/PersonalShopTitleImp.cpp +++ b/src/source/PersonalShopTitleImp.cpp @@ -540,9 +540,9 @@ void CPersonalShopTitleImp::CShopTitleDrawObj::Draw(int iPkLevel) - POINT RenderPos = { m_pos.x / g_fScreenRate_x, m_pos.y / g_fScreenRate_y }; - SIZE RenderBoxSize = { m_size.cx / g_fScreenRate_x, m_size.cy / g_fScreenRate_y }; - SIZE RenderIconSize = { m_icon.cx / g_fScreenRate_x, m_icon.cy / g_fScreenRate_y }; + POINT RenderPos = { static_cast(m_pos.x / g_fScreenRate_x), static_cast(m_pos.y / g_fScreenRate_y) }; + SIZE RenderBoxSize = { static_cast(m_size.cx / g_fScreenRate_x), static_cast(m_size.cy / g_fScreenRate_y) }; + SIZE RenderIconSize = { static_cast(m_icon.cx / g_fScreenRate_x), static_cast(m_icon.cy / g_fScreenRate_y) }; int iLineHeight = FontHeight / g_fScreenRate_y; g_pRenderText->SetFont(g_hFontBold); diff --git a/src/source/QuestMng.cpp b/src/source/QuestMng.cpp index 0cbc4c8f5..e34f372c5 100644 --- a/src/source/QuestMng.cpp +++ b/src/source/QuestMng.cpp @@ -338,7 +338,7 @@ const wchar_t* CQuestMng::GetNPCDlgAnswer(DWORD dwDlgState, int nAnswer) int CQuestMng::GetNPCDlgAnswerResult(DWORD dwDlgState, int nAnswer) { if (0 == m_nNPCIndex) - return NULL; + return 0; _ASSERT(0 <= nAnswer || nAnswer < QM_MAX_ND_ANSWER); diff --git a/src/source/SMD.cpp b/src/source/SMD.cpp index 9763c5b43..5fca47c03 100644 --- a/src/source/SMD.cpp +++ b/src/source/SMD.cpp @@ -20,13 +20,13 @@ void ParseNodes() { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("nodes", TokenString) == NULL) break; + if (Token == NAME && strcmp("nodes", TokenString) == 0) break; } while (true) { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("end", TokenString) == NULL) break; + if (Token == NAME && strcmp("end", TokenString) == 0) break; if (Token == NUMBER) { Node_t* n = &ng->Node[ng->NodeNum]; @@ -39,7 +39,7 @@ void ParseNodes() { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("skeleton", TokenString) == NULL) break; + if (Token == NAME && strcmp("skeleton", TokenString) == 0) break; } while (true) { @@ -47,8 +47,8 @@ void ParseNodes() if (Token == END) break; if (Token == NAME) { - if (strcmp("end", TokenString) == NULL) break; - if (strcmp("time", TokenString) == NULL) + if (strcmp("end", TokenString) == 0) break; + if (strcmp("time", TokenString) == 0) { Token = (*GetToken)(); Skeleton_t* s = &ng->Skeleton; @@ -74,7 +74,7 @@ void ParseSkeleton() { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("skeleton", TokenString) == NULL) break; + if (Token == NAME && strcmp("skeleton", TokenString) == 0) break; } SkeletonGroup_t* sg = &SkeletonGroup; @@ -85,8 +85,8 @@ void ParseSkeleton() if (Token == END) break; if (Token == NAME) { - if (strcmp("end", TokenString) == NULL) break; - if (strcmp("time", TokenString) == NULL) + if (strcmp("end", TokenString) == 0) break; + if (strcmp("time", TokenString) == 0) { Token = (*GetToken)(); int TimeNum = (int)TokenNumber; @@ -114,7 +114,7 @@ void ParseTriangles(bool Flip) { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("triangles", TokenString) == NULL) break; + if (Token == NAME && strcmp("triangles", TokenString) == 0) break; } TriangleGroup_t* tg = &TriangleGroup; @@ -125,7 +125,7 @@ void ParseTriangles(bool Flip) if (Token == END) break; if (Token == NAME) { - if (strcmp("end", TokenString) == NULL) break; + if (strcmp("end", TokenString) == 0) break; strcpy(tg->TextureName[tg->TriangleNum], TokenString); if (!Flip) { diff --git a/src/source/SMD2BMD.cpp b/src/source/SMD2BMD.cpp index 0637e2342..d79e3c368 100644 --- a/src/source/SMD2BMD.cpp +++ b/src/source/SMD2BMD.cpp @@ -79,7 +79,7 @@ void FixupSMD() int MeshNum = 0; for (int k = 0; k < mg->MeshNum; k++) { - if (strcmp(tg->TextureName[i], mg->Texture[k].FileName) == NULL) + if (strcmp(tg->TextureName[i], mg->Texture[k].FileName) == 0) { MeshNum = k; break; diff --git a/src/source/Scenes/CharacterScene.cpp b/src/source/Scenes/CharacterScene.cpp index 92f9eda81..c6a3d8cf3 100644 --- a/src/source/Scenes/CharacterScene.cpp +++ b/src/source/Scenes/CharacterScene.cpp @@ -87,7 +87,7 @@ void CreateCharacterScene() EnableMainRender = true; MouseOnWindow = false; - ErrorMessage = NULL; + ErrorMessage = 0; gMapManager.WorldActive = WD_74NEW_CHARACTER_SCENE; diff --git a/src/source/Scenes/MainScene.cpp b/src/source/Scenes/MainScene.cpp index cfc43e726..09a0acfee 100644 --- a/src/source/Scenes/MainScene.cpp +++ b/src/source/Scenes/MainScene.cpp @@ -322,7 +322,7 @@ void MoveMainScene() InitializeSceneFrame(); UpdateUIAndInput(); - if (ErrorMessage != NULL) + if (ErrorMessage != 0) MouseOnWindow = true; UpdateGameEntities(); diff --git a/src/source/Scenes/SceneCore.cpp b/src/source/Scenes/SceneCore.cpp index 2c940cc4c..b77c2f336 100644 --- a/src/source/Scenes/SceneCore.cpp +++ b/src/source/Scenes/SceneCore.cpp @@ -88,7 +88,7 @@ extern int HeroKey; int DeleteGuildIndex = -1; -int ErrorMessage = NULL; +int ErrorMessage = 0; extern bool g_bEnterPressed; extern wchar_t LogInID[MAX_USERNAME_SIZE + 1]; diff --git a/src/source/TextureScript.cpp b/src/source/TextureScript.cpp index f4f4df01a..e803aaa72 100644 --- a/src/source/TextureScript.cpp +++ b/src/source/TextureScript.cpp @@ -55,16 +55,6 @@ bool TextureScriptParsing::parsingTScriptA(char* filename) m_bBeScript = true; break; - case 'DC': - m_byShadowMesh = 1; // NoneTexture. - m_bBeScript = true; - break; - - case 'DT': - m_byShadowMesh = 2; // Texture. - m_bBeScript = true; - break; - default: m_bBeScript = false; #ifdef PJH_ADD_PANDA_CHANGERING @@ -82,75 +72,3 @@ bool TextureScriptParsing::parsingTScriptA(char* filename) return m_bBeScript; } -bool TextureScriptParsing::parsingTScript(wchar_t* filename) -{ - int ch = '_'; - wchar_t str[] = L"RHSN"; - wchar_t* strDest; - wchar_t* strTokenFile; - wchar_t strFileName[32]; - - memcpy(strFileName, filename, 32); - strTokenFile = wcschr(strFileName, ch); - if (strTokenFile != NULL) - { - wchar_t* context = nullptr; - strDest = wcstok_s(strTokenFile, L".", &context); - int length = std::min(5, wcslen(strDest)); - - int result = wcscspn(strDest, str); - if (result)//if ( m_strDest!=NULL ) - { - for (int i = 1; i < length; ++i) - { - switch (strTokenFile[i]) - { - case L'R': - m_bBright = true; - m_bBeScript = true; - break; - - case L'H': - m_bHiddenMesh = true; - m_bBeScript = true; - break; - - case L'S': - m_bStreamMesh = true; - m_bBeScript = true; - break; - - case L'N': - m_bNoneBlendMesh = true; - m_bBeScript = true; - break; - - case L'D': - if (strTokenFile[i + 1] == L'C') - { - m_byShadowMesh = 1; // NoneTexture. - m_bBeScript = true; - } - else if (strTokenFile[i + 1] == L'T') - { - m_byShadowMesh = 2; // Texture. - m_bBeScript = true; - } - break; - - default: - m_bBeScript = false; -#ifdef PJH_ADD_PANDA_CHANGERING - if (wcscmp(L"mu_rgb_lights.jpg", filename) == 0) - { - m_bBright = true; - m_bBeScript = true; - } -#endif //PJH_ADD_PANDA_CHANGERING - return m_bBeScript; - } - } - } - } - return m_bBeScript; -} \ No newline at end of file diff --git a/src/source/TextureScript.h b/src/source/TextureScript.h index 82714d171..a2da83d84 100644 --- a/src/source/TextureScript.h +++ b/src/source/TextureScript.h @@ -50,6 +50,5 @@ class TextureScriptParsing : public TextureScript ~TextureScriptParsing(void) {}; bool IsScript(void) { return m_bBeScript; } - bool parsingTScript(wchar_t* filename); bool parsingTScriptA(char* filename); }; diff --git a/src/source/UIControls.cpp b/src/source/UIControls.cpp index 39c7fcdd4..832a4173c 100644 --- a/src/source/UIControls.cpp +++ b/src/source/UIControls.cpp @@ -1149,7 +1149,7 @@ void CUIGuildListBox::AddText(const wchar_t* pszID, BYTE Number, BYTE Server) if (GetLineNum() == 0) { - if (wcscmp(pszID, Hero->ID) == NULL) m_bIsGuildMaster = TRUE; + if (wcscmp(pszID, Hero->ID) == 0) m_bIsGuildMaster = TRUE; else m_bIsGuildMaster = FALSE; } @@ -1238,7 +1238,7 @@ BOOL CUIGuildListBox::RenderDataLine(int iLineNumber) g_pRenderText->RenderText(m_iPos_x + m_iWidth - 60, iPos_y, Text); } - if (m_bIsGuildMaster == TRUE || wcscmp(m_TextListIter->m_szID, Hero->ID) == NULL) + if (m_bIsGuildMaster == TRUE || wcscmp(m_TextListIter->m_szID, Hero->ID) == 0) { float fWidth = 13; float fHeight = 11; @@ -1255,7 +1255,7 @@ BOOL CUIGuildListBox::RenderDataLine(int iLineNumber) g_pRenderText->SetTextColor(255, 255, 255, 255); g_pRenderText->SetBgColor(0, 0, 0, 255); - if (wcscmp(m_TextListIter->m_szID, Hero->ID) == NULL && wcscmp(GuildList[0].Name, Hero->ID) == NULL) + if (wcscmp(m_TextListIter->m_szID, Hero->ID) == 0 && wcscmp(GuildList[0].Name, Hero->ID) == 0) RenderTipText((int)x - 20, (int)y, GlobalText[188]); else RenderTipText((int)x - 20, (int)y, GlobalText[189]); @@ -1276,7 +1276,7 @@ BOOL CUIGuildListBox::DoSubMouseAction() { if (m_TextListIter == m_TextList.end()) break; - if (m_bIsGuildMaster == TRUE || wcscmp(m_TextListIter->m_szID, Hero->ID) == NULL) + if (m_bIsGuildMaster == TRUE || wcscmp(m_TextListIter->m_szID, Hero->ID) == 0) { int iPos_y; if (GetLineNum() > m_iNumRenderLine) iPos_y = m_iPos_y - 16 - i * 13; @@ -1500,7 +1500,7 @@ BOOL CUISimpleChatListBox::RenderDataLine(int iLineNumber) SIZE TextSize = { 0, 0 }; // 이름 - if (m_TextListIter->m_szID[0] != NULL) + if (m_TextListIter->m_szID[0] != 0) { switch (m_TextListIter->m_iType) { @@ -2646,7 +2646,7 @@ bool CUIRenderTextOriginal::Create(HDC hDC) DIB_INFO->bmiHeader.biBitCount = 24; DIB_INFO->bmiHeader.biCompression = BI_RGB; - m_hBitmap = CreateDIBSection(hDC, DIB_INFO, DIB_RGB_COLORS, (void**)&m_pFontBuffer, nullptr, NULL); + m_hBitmap = CreateDIBSection(hDC, DIB_INFO, DIB_RGB_COLORS, (void**)&m_pFontBuffer, nullptr, 0); m_hFontDC = CreateCompatibleDC(hDC); SelectObject(m_hFontDC, m_hBitmap); SelectObject(m_hFontDC, g_hFont); @@ -3324,7 +3324,7 @@ void CUITextInputBox::SetSize(int iWidth, int iHeight) DIB_INFO->bmiHeader.biBitCount = 24; DIB_INFO->bmiHeader.biCompression = BI_RGB; - m_hBitmap = CreateDIBSection(hDC, DIB_INFO, DIB_RGB_COLORS, (void**)&m_pFontBuffer, nullptr, NULL); + m_hBitmap = CreateDIBSection(hDC, DIB_INFO, DIB_RGB_COLORS, (void**)&m_pFontBuffer, nullptr, 0); m_hMemDC = CreateCompatibleDC(hDC); SelectObject(m_hMemDC, m_hBitmap); SetFont(g_hFont); @@ -3914,7 +3914,7 @@ const int MAX_HISTORY_LINES = 10; void CUIChatInputBox::AddHistory(const wchar_t* pszText) { - if (pszText == nullptr || pszText[0] == NULL) return; + if (pszText == nullptr || pszText[0] == 0) return; wchar_t* pszSaveText = new wchar_t[wcslen(pszText) + 1]; wcsncpy(pszSaveText, pszText, wcslen(pszText) + 1); @@ -4714,7 +4714,7 @@ void CUINewGuildMemberListBox::AddText(const wchar_t* pszID, BYTE Number, BYTE S if (GetLineNum() == 0) { - if (wcscmp(pszID, Hero->ID) == NULL) m_bIsGuildMaster = TRUE; + if (wcscmp(pszID, Hero->ID) == 0) m_bIsGuildMaster = TRUE; else m_bIsGuildMaster = FALSE; } @@ -4930,7 +4930,7 @@ void CUIUnionGuildListBox::AddText(BYTE* pGuildMark, const wchar_t* szGuildName, text.m_bIsSelected = FALSE; memcpy(text.GuildMark, pGuildMark, sizeof(BYTE) * 64); wcsncpy(text.szName, szGuildName, MAX_GUILDNAME); - text.szName[MAX_GUILDNAME] = NULL; + text.szName[MAX_GUILDNAME] = 0; text.nMemberCount = nMemberCount; m_TextList.push_front(text); @@ -5304,7 +5304,7 @@ void CUIBCDeclareGuildListBox::AddText(const wchar_t* szGuildName, int nMarkCoun static BCDECLAREGUILD_TEXT text; text.m_bIsSelected = FALSE; wcsncpy(text.szName, szGuildName, MAX_GUILDNAME); - text.szName[MAX_GUILDNAME] = NULL; + text.szName[MAX_GUILDNAME] = 0; text.nCount = nMarkCount; text.byIsGiveUp = byIsGiveUp; text.bySeqNum = bySeqNum; @@ -5380,7 +5380,7 @@ BOOL CUIBCDeclareGuildListBox::RenderDataLine(int iLineNumber) mu_swprintf(Text, L"%ls", m_TextListIter->szName); - if ((wcscmp(GuildMark[Hero->GuildMarkIndex].UnionName, Text) != NULL && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, Text) != NULL)) + if ((wcscmp(GuildMark[Hero->GuildMarkIndex].UnionName, Text) != 0 && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, Text) != 0)) { return FALSE; } @@ -5476,7 +5476,7 @@ void CUIBCGuildListBox::AddText(const wchar_t* szGuildName, BYTE byJoinSide, BYT static BCGUILD_TEXT text; text.m_bIsSelected = FALSE; wcsncpy(text.szName, szGuildName, MAX_GUILDNAME); - text.szName[MAX_GUILDNAME] = NULL; + text.szName[MAX_GUILDNAME] = 0; text.byJoinSide = byJoinSide; text.byGuildInvolved = byGuildInvolved; text.iGuildScore = iGuildScore; diff --git a/src/source/UIManager.cpp b/src/source/UIManager.cpp index ed3115c07..5ecb20ccc 100644 --- a/src/source/UIManager.cpp +++ b/src/source/UIManager.cpp @@ -98,7 +98,7 @@ POINT CUIManager::RenderWindowBase(int nHeight, int nOriginY) } else fPosY = nOriginY; - POINT ptPos = { fPosX, fPosY }; + POINT ptPos = { static_cast(fPosX), static_cast(fPosY) }; RenderBitmap(BITMAP_INTERFACE + 22, fPosX, fPosY, nWidth, 5, 0.f, 0.f, nWidth / 256.f, 5.f / 8.f); fPosY += 5; diff --git a/src/source/UIMng.cpp b/src/source/UIMng.cpp index d7cf9fbf6..bbf39d76f 100644 --- a/src/source/UIMng.cpp +++ b/src/source/UIMng.cpp @@ -692,7 +692,7 @@ void CUIMng::Update(double dDeltaTick) m_bBlockCharMove = false; } int nlist = m_WinList.GetCount(); - CWin** apTempWin = new (CWin * [nlist]); + std::vector apTempWin(nlist); position = m_WinList.GetHeadPosition(); for (int i = 0; i < nlist; ++i) @@ -717,8 +717,6 @@ void CUIMng::Update(double dDeltaTick) apTempWin[i]->Update(dDeltaTick); } - SAFE_DELETE_ARRAY(apTempWin); - // CheckKey(); CheckDockWin(); diff --git a/src/source/UIPopup.cpp b/src/source/UIPopup.cpp index 61f84bfa1..11672db22 100644 --- a/src/source/UIPopup.cpp +++ b/src/source/UIPopup.cpp @@ -136,7 +136,7 @@ wchar_t* CUIPopup::GetInputText() if (InputText[0]) wcscpy(m_szInputText, InputText[0]); else - m_szInputText[0] = NULL; + m_szInputText[0] = 0; } return m_szInputText; diff --git a/src/source/UIWindows.cpp b/src/source/UIWindows.cpp index 80a7a32dd..96d1d4f48 100644 --- a/src/source/UIWindows.cpp +++ b/src/source/UIWindows.cpp @@ -2147,15 +2147,15 @@ void CUIPhotoViewer::CopyPlayer() else // 변신 상태 { if (CompareItemEqual(&m_PhotoChar.BodyPart[BODYPART_HELM], &CharacterMachine->Equipment[EQUIPMENT_HELM], - MODEL_BODY_HELM + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; + static_cast(MODEL_BODY_HELM) + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; else if (CompareItemEqual(&m_PhotoChar.BodyPart[BODYPART_ARMOR], &CharacterMachine->Equipment[EQUIPMENT_ARMOR], - MODEL_BODY_ARMOR + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; + static_cast(MODEL_BODY_ARMOR) + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; else if (CompareItemEqual(&m_PhotoChar.BodyPart[BODYPART_PANTS], &CharacterMachine->Equipment[EQUIPMENT_PANTS], - MODEL_BODY_PANTS + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; + static_cast(MODEL_BODY_PANTS) + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; else if (CompareItemEqual(&m_PhotoChar.BodyPart[BODYPART_GLOVES], &CharacterMachine->Equipment[EQUIPMENT_GLOVES], - MODEL_BODY_GLOVES + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; + static_cast(MODEL_BODY_GLOVES) + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; else if (CompareItemEqual(&m_PhotoChar.BodyPart[BODYPART_BOOTS], &CharacterMachine->Equipment[EQUIPMENT_BOOTS], - MODEL_BODY_BOOTS + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; + static_cast(MODEL_BODY_BOOTS) + Hero->SkinIndex) == FALSE) bChangeArmor = TRUE; for (i = 0; i < 2; ++i) { @@ -2207,17 +2207,17 @@ void CUIPhotoViewer::CopyPlayer() { DeleteCloth(&m_PhotoChar, NULL, NULL); - m_PhotoChar.BodyPart[BODYPART_HEAD].Type = MODEL_BODY_HELM + Hero->SkinIndex; + m_PhotoChar.BodyPart[BODYPART_HEAD].Type = static_cast(MODEL_BODY_HELM) + Hero->SkinIndex; SetItemToPhoto(&m_PhotoChar.BodyPart[BODYPART_HELM], &CharacterMachine->Equipment[EQUIPMENT_HELM], - MODEL_BODY_HELM + Hero->SkinIndex); + static_cast(MODEL_BODY_HELM) + Hero->SkinIndex); SetItemToPhoto(&m_PhotoChar.BodyPart[BODYPART_ARMOR], &CharacterMachine->Equipment[EQUIPMENT_ARMOR], - MODEL_BODY_ARMOR + Hero->SkinIndex); + static_cast(MODEL_BODY_ARMOR) + Hero->SkinIndex); SetItemToPhoto(&m_PhotoChar.BodyPart[BODYPART_PANTS], &CharacterMachine->Equipment[EQUIPMENT_PANTS], - MODEL_BODY_PANTS + Hero->SkinIndex); + static_cast(MODEL_BODY_PANTS) + Hero->SkinIndex); SetItemToPhoto(&m_PhotoChar.BodyPart[BODYPART_GLOVES], &CharacterMachine->Equipment[EQUIPMENT_GLOVES], - MODEL_BODY_GLOVES + Hero->SkinIndex); + static_cast(MODEL_BODY_GLOVES) + Hero->SkinIndex); SetItemToPhoto(&m_PhotoChar.BodyPart[BODYPART_BOOTS], &CharacterMachine->Equipment[EQUIPMENT_BOOTS], - MODEL_BODY_BOOTS + Hero->SkinIndex); + static_cast(MODEL_BODY_BOOTS) + Hero->SkinIndex); for (i = 0; i < MAX_BODYPART; ++i) { @@ -3941,7 +3941,7 @@ void CUIChatRoomListTabWindow::RemoveWindow(DWORD dwUIID) DWORD CUIChatRoomListTabWindow::GetCurrentSelectedWindow() { - if (m_WindowListBox.GetSelectedText() == NULL) return NULL; + if (m_WindowListBox.GetSelectedText() == nullptr) return 0; else return m_WindowListBox.GetSelectedText()->m_dwUIID; } @@ -4201,20 +4201,12 @@ void CLetterList::RemoveLetterTextCache(DWORD dwIndex) m_LetterCacheIter = m_LetterCache.find(dwIndex); if (m_LetterCacheIter != m_LetterCache.end()) { - auto letter = &m_LetterCacheIter->second; - delete letter; m_LetterCache.erase(m_LetterCacheIter); } } void CLetterList::ClearLetterTextCache() { - for (auto cachedLetter : m_LetterCache) - { - auto letter = &cachedLetter.second; - delete letter; - } - m_LetterCache.clear(); } diff --git a/src/source/UsefulDef.cpp b/src/source/UsefulDef.cpp index 2a49b587e..a16cd328c 100644 --- a/src/source/UsefulDef.cpp +++ b/src/source/UsefulDef.cpp @@ -132,7 +132,7 @@ BOOL CheckErrString(LPTSTR lpszTarget) { if (i == nLen - 1) { - lpszTarget[i] = NULL; + lpszTarget[i] = 0; return FALSE; } else diff --git a/src/source/WSclient.cpp b/src/source/WSclient.cpp index 7e84ce979..687e4389d 100644 --- a/src/source/WSclient.cpp +++ b/src/source/WSclient.cpp @@ -401,7 +401,7 @@ int FindGuildName(wchar_t* Name) for (int i = 0; i < MARK_EDIT; i++) { MARK_t* p = &GuildMark[i]; - if (wcscmp(p->GuildName, Name) == NULL) + if (wcscmp(p->GuildName, Name) == 0) { return i; } @@ -437,7 +437,7 @@ void InitGuildWar() { EnableGuildWar = false; GuildWarIndex = -1; - GuildWarName[0] = NULL; + GuildWarName[0] = 0; for (int i = 0; i < MAX_CHARACTERS_CLIENT; i++) { CHARACTER* c = &CharactersClient[i]; @@ -1723,7 +1723,7 @@ void ReceiveChat(const BYTE* ReceiveBuffer) OBJECT* o = &c->Object; if (o->Live && o->Kind == KIND_PLAYER && (g_isCharacterBuff((&c->Object), eBuff_GMEffect) || (c->CtlCode == CTLCODE_20OPERATOR) || (c->CtlCode == CTLCODE_08OPERATOR))) { - if (wcscmp(c->ID, ID) == NULL) + if (wcscmp(c->ID, ID) == 0) { pFindGm = c; break; @@ -1749,7 +1749,7 @@ void ReceiveChat(const BYTE* ReceiveBuffer) OBJECT* o = &c->Object; if (o->Live && o->Kind == KIND_PLAYER && g_isCharacterBuff((&c->Object), eBuff_GMEffect) || (c->CtlCode == CTLCODE_20OPERATOR) || (c->CtlCode == CTLCODE_08OPERATOR)) { - if (wcscmp(c->ID, ID) == NULL) + if (wcscmp(c->ID, ID) == 0) { pFindGm = c; break; @@ -2233,7 +2233,7 @@ void ReceiveChangePlayer(std::span ReceiveBuffer) case 2: if (Data->ItemGroup == 0xFF) { - c->BodyPart[BODYPART_HELM].Type = MODEL_BODY_HELM + c->SkinIndex; + c->BodyPart[BODYPART_HELM].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; c->BodyPart[BODYPART_HELM].Level = 0; c->BodyPart[BODYPART_HELM].ExcellentFlags = 0; c->BodyPart[BODYPART_HELM].AncientDiscriminator = 0; @@ -2249,7 +2249,7 @@ void ReceiveChangePlayer(std::span ReceiveBuffer) case 3: if (Data->ItemGroup == 0xFF) { - c->BodyPart[BODYPART_ARMOR].Type = MODEL_BODY_ARMOR + c->SkinIndex; + c->BodyPart[BODYPART_ARMOR].Type = static_cast(MODEL_BODY_ARMOR) + c->SkinIndex; c->BodyPart[BODYPART_ARMOR].Level = 0; c->BodyPart[BODYPART_ARMOR].ExcellentFlags = 0; c->BodyPart[BODYPART_ARMOR].AncientDiscriminator = 0; @@ -2265,7 +2265,7 @@ void ReceiveChangePlayer(std::span ReceiveBuffer) case 4: if (Data->ItemGroup == 0xFF) { - c->BodyPart[BODYPART_PANTS].Type = MODEL_BODY_PANTS + c->SkinIndex; + c->BodyPart[BODYPART_PANTS].Type = static_cast(MODEL_BODY_PANTS) + c->SkinIndex; c->BodyPart[BODYPART_PANTS].Level = 0; c->BodyPart[BODYPART_PANTS].ExcellentFlags = 0; c->BodyPart[BODYPART_PANTS].AncientDiscriminator = 0; @@ -2281,7 +2281,7 @@ void ReceiveChangePlayer(std::span ReceiveBuffer) case 5: if (Data->ItemGroup == 0xFF) { - c->BodyPart[BODYPART_GLOVES].Type = MODEL_BODY_GLOVES + c->SkinIndex; + c->BodyPart[BODYPART_GLOVES].Type = static_cast(MODEL_BODY_GLOVES) + c->SkinIndex; c->BodyPart[BODYPART_GLOVES].Level = 0; c->BodyPart[BODYPART_GLOVES].ExcellentFlags = 0; c->BodyPart[BODYPART_GLOVES].AncientDiscriminator = 0; @@ -2297,7 +2297,7 @@ void ReceiveChangePlayer(std::span ReceiveBuffer) case 6: if (Data->ItemGroup == 0xFF) { - c->BodyPart[BODYPART_BOOTS].Type = MODEL_BODY_BOOTS + c->SkinIndex; + c->BodyPart[BODYPART_BOOTS].Type = static_cast(MODEL_BODY_BOOTS) + c->SkinIndex; c->BodyPart[BODYPART_BOOTS].Level = 0; c->BodyPart[BODYPART_BOOTS].ExcellentFlags = 0; c->BodyPart[BODYPART_BOOTS].AncientDiscriminator = 0; @@ -2936,7 +2936,7 @@ void ReceiveCreateSummonViewport(const BYTE* ReceiveBuffer) wcscat(c->ID, Temp); CMultiLanguage::ConvertFromUtf8(c->OwnerID, Data2->ID, MAX_USERNAME_SIZE); - c->OwnerID[MAX_USERNAME_SIZE] = NULL; + c->OwnerID[MAX_USERNAME_SIZE] = 0; } if (CreateFlag) @@ -4179,20 +4179,20 @@ BOOL ReceiveMagic(const BYTE* ReceiveBuffer, int Size, BOOL bEncrypted) case AT_SKILL_FALLING_SLASH: case AT_SKILL_FALLING_SLASH_STR: - SetAction(so, PLAYER_ATTACK_SKILL_SWORD1 + AT_SKILL_FALLING_SLASH - AT_SKILL_FALLING_SLASH); + SetAction(so, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + AT_SKILL_FALLING_SLASH - AT_SKILL_FALLING_SLASH); sc->AttackTime = 1; PlayBuffer(SOUND_SKILL_SWORD1); break; case AT_SKILL_LUNGE: case AT_SKILL_LUNGE_STR: - SetAction(so, PLAYER_ATTACK_SKILL_SWORD1 + AT_SKILL_LUNGE - AT_SKILL_FALLING_SLASH); + SetAction(so, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + AT_SKILL_LUNGE - AT_SKILL_FALLING_SLASH); sc->AttackTime = 1; PlayBuffer(SOUND_SKILL_SWORD2); break; case AT_SKILL_UPPERCUT: - SetAction(so, PLAYER_ATTACK_SKILL_SWORD1 + AT_SKILL_UPPERCUT - AT_SKILL_FALLING_SLASH); + SetAction(so, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + AT_SKILL_UPPERCUT - AT_SKILL_FALLING_SLASH); sc->AttackTime = 1; PlayBuffer(SOUND_SKILL_SWORD3); break; @@ -4200,7 +4200,7 @@ BOOL ReceiveMagic(const BYTE* ReceiveBuffer, int Size, BOOL bEncrypted) case AT_SKILL_CYCLONE: case AT_SKILL_CYCLONE_STR: case AT_SKILL_CYCLONE_STR_MG: - SetAction(so, PLAYER_ATTACK_SKILL_SWORD1 + AT_SKILL_CYCLONE - AT_SKILL_FALLING_SLASH); + SetAction(so, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + AT_SKILL_CYCLONE - AT_SKILL_FALLING_SLASH); sc->AttackTime = 1; PlayBuffer(SOUND_SKILL_SWORD4); break; @@ -4209,7 +4209,7 @@ BOOL ReceiveMagic(const BYTE* ReceiveBuffer, int Size, BOOL bEncrypted) case AT_SKILL_SLASH_STR: if (sc->SwordCount % 2 == 0) { - SetAction(so, PLAYER_ATTACK_SKILL_SWORD1 + AT_SKILL_SLASH - AT_SKILL_FALLING_SLASH); + SetAction(so, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + AT_SKILL_SLASH - AT_SKILL_FALLING_SLASH); } else { @@ -7159,7 +7159,7 @@ void ReceivePartyList(const BYTE* ReceiveBuffer) auto Data2 = (LPPRECEIVE_PARTY_LIST)(ReceiveBuffer + Offset); PARTY_t* p = &Party[i]; CMultiLanguage::ConvertFromUtf8(p->Name, Data2->ID, MAX_USERNAME_SIZE); - p->Name[MAX_USERNAME_SIZE] = NULL; + p->Name[MAX_USERNAME_SIZE] = 0; p->Number = Data2->Number; p->Map = Data2->Map; p->x = Data2->x; @@ -7200,7 +7200,7 @@ void ReceivePartyLeave(const BYTE* ReceiveBuffer) CHARACTER* c = &CharactersClient[g_iFollowCharacter]; for (int i = 0; i < PartyNumber; ++i) { - if (wcscmp(Party[i].Name, c->ID) == NULL && wcslen(Party[i].Name) == wcslen(c->ID)) + if (wcscmp(Party[i].Name, c->ID) == 0 && wcslen(Party[i].Name) == wcslen(c->ID)) { IsParty = true; } @@ -7316,8 +7316,8 @@ void ReceiveGuildLeave(const BYTE* ReceiveBuffer) if (Data->Value == 4 && Hero->GuildMarkIndex != -1) { GuildMark[Hero->GuildMarkIndex].Key = -1; - GuildMark[Hero->GuildMarkIndex].UnionName[0] = NULL; - GuildMark[Hero->GuildMarkIndex].GuildName[0] = NULL; + GuildMark[Hero->GuildMarkIndex].UnionName[0] = 0; + GuildMark[Hero->GuildMarkIndex].GuildName[0] = 0; Hero->GuildMarkIndex = -1; } @@ -7460,11 +7460,7 @@ void ReceiveGuildBeginWar(const BYTE* ReceiveBuffer) for (int i = 0; i < MARK_EDIT; i++) { MARK_t* p = &GuildMark[i]; - wchar_t Temp[8 + 1]; - memset(Temp, 0, 8); - memcpy(Temp, (wchar_t*)Data->Name, 8); - Temp[8] = NULL; - if (wcscmp(p->GuildName, Temp) == NULL) + if (wcscmp(p->GuildName, GuildWarName) == 0) { GuildWarIndex = i; break; @@ -7513,7 +7509,7 @@ void ReceiveGuildEndWar(const BYTE* ReceiveBuffer) EnableSoccer = false; GuildWarIndex = -1; - GuildWarName[0] = NULL; + GuildWarName[0] = 0; for (int i = 0; i < MAX_CHARACTERS_CLIENT; i++) { CHARACTER* c = &CharactersClient[i]; @@ -7754,7 +7750,7 @@ void ReceiveGuildRelationShipResult(const BYTE* ReceiveBuffer) int nCharKey = MAKEWORD(pData->byTargetUserIndexL, pData->byTargetUserIndexH); if (nCharKey == HeroKey && pData->byResult == 0x01 && pData->byRelationShipType == 0x01 && pData->byRequestType == 0x02) - GuildMark[Hero->GuildMarkIndex].UnionName[0] = NULL; + GuildMark[Hero->GuildMarkIndex].UnionName[0] = 0; } void ReceiveBanUnionGuildResult(const BYTE* ReceiveBuffer) @@ -7893,7 +7889,7 @@ void Receive_Master_LevelUp(const BYTE* ReceiveBuffer, int Size) Master_Level_Data.wMaxBP = Data->wMaxBP; } - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; DWORD iExp = Master_Level_Data.lNext_MasterLevel_Experince - Master_Level_Data.lMasterLevel_Experince; if (iExp > 0) { @@ -11589,7 +11585,7 @@ void ReceivePreviewPort(std::span ReceiveBuffer) ChangeCharacterExt(FindCharacterIndex(Key), pData2->m_byEquipment); wcscpy(c->ID, L" "); - c->ID[MAX_USERNAME_SIZE] = NULL; + c->ID[MAX_USERNAME_SIZE] = 0; } break; @@ -12302,7 +12298,7 @@ bool ReceiveEnterEmpireGuardianEvent(const BYTE* ReceiveBuffer) SEASON3B::CreateMessageBox(MSGBOX_LAYOUT_CLASS(SEASON3B::CEmpireGuardianMsgBoxLayout), &pMsgBox); pMsgBox->AddMsg(GlobalText[2798], RGBA(255, 255, 255, 255), SEASON3B::MSGBOX_FONT_NORMAL); pMsgBox->AddMsg(L" "); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[2799], (Data->RemainTick / 60000)); pMsgBox->AddMsg(szText, RGBA(255, 255, 255, 255), SEASON3B::MSGBOX_FONT_NORMAL); }break; @@ -12373,7 +12369,7 @@ bool ReceiveResultEmpireGuardian(const BYTE* ReceiveBuffer) int zone = g_pEmpireGuardianTimer->GetZone(); SEASON3B::CNewUICommonMessageBox* pMsgBox; SEASON3B::CreateMessageBox(MSGBOX_LAYOUT_CLASS(SEASON3B::CEmpireGuardianMsgBoxLayout), &pMsgBox); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[2801], day); pMsgBox->AddMsg(szText, RGBA(255, 255, 255, 255), SEASON3B::MSGBOX_FONT_NORMAL); mu_swprintf(szText, L"%d%ls", zone, GlobalText[2840]); @@ -12384,7 +12380,7 @@ bool ReceiveResultEmpireGuardian(const BYTE* ReceiveBuffer) int day = g_pEmpireGuardianTimer->GetDay(); SEASON3B::CNewUICommonMessageBox* pMsgBox; SEASON3B::CreateMessageBox(MSGBOX_LAYOUT_CLASS(SEASON3B::CEmpireGuardianMsgBoxLayout), &pMsgBox); - wchar_t szText[256] = { NULL, }; + wchar_t szText[256] = {}; mu_swprintf(szText, GlobalText[2801], day); pMsgBox->AddMsg(szText, RGBA(255, 255, 255, 255), SEASON3B::MSGBOX_FONT_NORMAL); pMsgBox->AddMsg(GlobalText[2802], RGBA(255, 255, 255, 255), SEASON3B::MSGBOX_FONT_NORMAL); @@ -12443,14 +12439,14 @@ bool ReceiveIGS_BuyItem(const BYTE* pReceiveBuffer) switch ((BYTE)Data->byResultCode) { - case -2: + case static_cast(-2): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); pMsgBox->Initialize(GlobalText[2902], GlobalText[2953]); } break; - case -1: + case static_cast(-1): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); @@ -12549,14 +12545,14 @@ bool ReceiveIGS_SendItemGift(const BYTE* pReceiveBuffer) switch ((BYTE)Data->byResultCode) { - case -2: + case static_cast(-2): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); pMsgBox->Initialize(GlobalText[2912], GlobalText[2953]); } break; - case -1: + case static_cast(-1): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); @@ -12731,14 +12727,14 @@ bool ReceiveIGS_UseStorageItem(const BYTE* pReceiveBuffer) switch ((BYTE)Data->byResult) { - case -2: + case static_cast(-2): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); pMsgBox->Initialize(GlobalText[2928], GlobalText[2967]); } break; - case -1: + case static_cast(-1): { CMsgBoxIGSCommon* pMsgBox = nullptr; CreateMessageBox(MSGBOX_LAYOUT_CLASS(CMsgBoxIGSCommonLayout), &pMsgBox); diff --git a/src/source/WSclient.h b/src/source/WSclient.h index 6dbcc2126..4ff63fcbe 100644 --- a/src/source/WSclient.h +++ b/src/source/WSclient.h @@ -1914,8 +1914,8 @@ typedef struct _PMSG_MATCH_RESULT { void Clear() { - memset(&m_MatchTeamName1, NULL, sizeof m_MatchTeamName1); - memset(&m_MatchTeamName2, NULL, sizeof m_MatchTeamName2); + memset(&m_MatchTeamName1, 0, sizeof m_MatchTeamName1); + memset(&m_MatchTeamName2, 0, sizeof m_MatchTeamName2); m_Score1 = 0; m_Score2 = 0; m_Type = 0; @@ -1936,8 +1936,8 @@ typedef struct _MATCH_RESULT { void Clear() { - memset(&m_MatchTeamName1, NULL, sizeof m_MatchTeamName1); - memset(&m_MatchTeamName2, NULL, sizeof m_MatchTeamName2); + memset(&m_MatchTeamName1, 0, sizeof m_MatchTeamName1); + memset(&m_MatchTeamName2, 0, sizeof m_MatchTeamName2); m_Score1 = 0; m_Score2 = 0; m_Type = 0; diff --git a/src/source/Winmain.cpp b/src/source/Winmain.cpp index 2414d052c..dd3f96492 100644 --- a/src/source/Winmain.cpp +++ b/src/source/Winmain.cpp @@ -1218,8 +1218,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLin if (g_bUseWindowMode == TRUE) { - RECT rc = { 0, 0, WindowWidth, WindowHeight }; - AdjustWindowRect(&rc, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN, NULL); + RECT rc = { 0, 0, static_cast(WindowWidth), static_cast(WindowHeight) }; + AdjustWindowRect(&rc, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN, 0); g_hWnd = CreateWindow( windowName, windowName, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN, diff --git a/src/source/ZzzCharacter.cpp b/src/source/ZzzCharacter.cpp index 98838ef57..b2cf96ae8 100644 --- a/src/source/ZzzCharacter.cpp +++ b/src/source/ZzzCharacter.cpp @@ -9057,7 +9057,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) { if (EnableSoccer) { - if (wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) + if (wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) { bCloak = true; if (HeroSoccerTeam == 0) @@ -9069,7 +9069,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) Vector(0.f, 0.2f, 1.f, CloakLight); } } - if (wcscmp(GuildWarName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) + if (wcscmp(GuildWarName, GuildMark[c->GuildMarkIndex].GuildName) == 0) { bCloak = true; if (HeroSoccerTeam == 0) @@ -9084,12 +9084,12 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) } if (SoccerObserver) { - if (wcscmp(SoccerTeamName[0], GuildMark[c->GuildMarkIndex].GuildName) == NULL) + if (wcscmp(SoccerTeamName[0], GuildMark[c->GuildMarkIndex].GuildName) == 0) { bCloak = true; Vector(1.f, 0.2f, 0.f, CloakLight); } - if (wcscmp(SoccerTeamName[1], GuildMark[c->GuildMarkIndex].GuildName) == NULL) + if (wcscmp(SoccerTeamName[1], GuildMark[c->GuildMarkIndex].GuildName) == 0) { bCloak = true; Vector(0.f, 0.2f, 1.f, CloakLight); @@ -9615,12 +9615,12 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) numCloth = 3; } - if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + SKIN_CLASS_DARK_LORD) + if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_DARK_LORD) { pCloth[3].Create(o, 18, 0.0f, 10.0f, -5.0f, 5, 5, 50.0f, 90.0f, BITMAP_DARK_LOAD_SKIRT, BITMAP_DARK_LOAD_SKIRT, PCT_MASK_ALPHA | PCT_HEAVY | PCT_STICKED | PCT_SHORT_SHOULDER); pCloth[3].AddCollisionSphere(0.0f, -15.0f, -20.0f, 30.0f, 2); } - else if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + SKIN_CLASS_LORDEMPEROR) + else if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_LORDEMPEROR) { pCloth[3].Create(o, 18, 0.0f, 10.0f, -5.0f, 5, 5, 50.0f, 90.0f, BITMAP_DARKLOAD_SKIRT_3RD, BITMAP_DARKLOAD_SKIRT_3RD, PCT_MASK_ALPHA | PCT_HEAVY | PCT_STICKED | PCT_SHORT_SHOULDER); pCloth[3].AddCollisionSphere(0.0f, -15.0f, -20.0f, 30.0f, 2); @@ -9717,8 +9717,8 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) } else if (gCharacterManager.GetBaseClass(c->Class) == CLASS_DARK_LORD) { - if ((c->BodyPart[BODYPART_ARMOR].Type != MODEL_BODY_ARMOR + SKIN_CLASS_DARK_LORD - && c->BodyPart[BODYPART_ARMOR].Type != MODEL_BODY_ARMOR + SKIN_CLASS_LORDEMPEROR + if ((c->BodyPart[BODYPART_ARMOR].Type != static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_DARK_LORD + && c->BodyPart[BODYPART_ARMOR].Type != static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_LORDEMPEROR ) && o->m_byNumCloth == 4) { if (o && o->m_pCloth) @@ -9729,7 +9729,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) o->m_byNumCloth = 3; } } - else if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + CLASS_DARK_LORD && o->m_byNumCloth == 3) + else if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + CLASS_DARK_LORD && o->m_byNumCloth == 3) { if (o && o->m_pCloth) { @@ -9740,7 +9740,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) o->m_byNumCloth = 4; } } - else if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + SKIN_CLASS_LORDEMPEROR && o->m_byNumCloth == 3) + else if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_LORDEMPEROR && o->m_byNumCloth == 3) { if (o && o->m_pCloth) { @@ -9751,7 +9751,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) o->m_byNumCloth = 4; } } - else if (c->BodyPart[BODYPART_ARMOR].Type != MODEL_BODY_ARMOR + SKIN_CLASS_DARK_LORD && o->m_byNumCloth == 6) + else if (c->BodyPart[BODYPART_ARMOR].Type != static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_DARK_LORD && o->m_byNumCloth == 6) { if (o && o->m_pCloth) { @@ -9760,7 +9760,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) pCloth[3].Destroy(); } } - else if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + SKIN_CLASS_DARK_LORD && o->m_byNumCloth == 6) + else if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_DARK_LORD && o->m_byNumCloth == 6) { if (o && o->m_pCloth) { @@ -9772,7 +9772,7 @@ void RenderCharacter(CHARACTER* c, OBJECT* o, int Select) } } } - else if (c->BodyPart[BODYPART_ARMOR].Type == MODEL_BODY_ARMOR + SKIN_CLASS_LORDEMPEROR && o->m_byNumCloth == 6) + else if (c->BodyPart[BODYPART_ARMOR].Type == static_cast(MODEL_BODY_ARMOR) + SKIN_CLASS_LORDEMPEROR && o->m_byNumCloth == 6) { if (o && o->m_pCloth) { @@ -11983,7 +11983,7 @@ void SetCharacterScale(CHARACTER* c) c->BodyPart[BODYPART_HELM].Type == MODEL_HELM + 70 || (c->BodyPart[BODYPART_HELM].Type >= MODEL_VINE_HELM && c->BodyPart[BODYPART_HELM].Type <= MODEL_SPIRIT_HELM)) { - c->BodyPart[BODYPART_HEAD].Type = MODEL_BODY_HELM + c->SkinIndex; + c->BodyPart[BODYPART_HEAD].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; } else { @@ -12104,7 +12104,7 @@ void SetCharacterClass(CHARACTER* c) if (p[EQUIPMENT_HELM].Type == -1) { - c->BodyPart[BODYPART_HELM].Type = MODEL_BODY_HELM + c->SkinIndex; + c->BodyPart[BODYPART_HELM].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; c->BodyPart[BODYPART_HELM].Level = 0; c->BodyPart[BODYPART_HELM].ExcellentFlags = 0; c->BodyPart[BODYPART_HELM].AncientDiscriminator = 0; @@ -12119,7 +12119,7 @@ void SetCharacterClass(CHARACTER* c) if (p[EQUIPMENT_ARMOR].Type == -1) { - c->BodyPart[BODYPART_ARMOR].Type = MODEL_BODY_ARMOR + c->SkinIndex; + c->BodyPart[BODYPART_ARMOR].Type = static_cast(MODEL_BODY_ARMOR) + c->SkinIndex; c->BodyPart[BODYPART_ARMOR].Level = 0; c->BodyPart[BODYPART_ARMOR].ExcellentFlags = 0; c->BodyPart[BODYPART_ARMOR].AncientDiscriminator = 0; @@ -12134,7 +12134,7 @@ void SetCharacterClass(CHARACTER* c) if (p[EQUIPMENT_PANTS].Type == -1) { - c->BodyPart[BODYPART_PANTS].Type = MODEL_BODY_PANTS + c->SkinIndex; + c->BodyPart[BODYPART_PANTS].Type = static_cast(MODEL_BODY_PANTS) + c->SkinIndex; c->BodyPart[BODYPART_PANTS].Level = 0; c->BodyPart[BODYPART_PANTS].ExcellentFlags = 0; c->BodyPart[BODYPART_PANTS].AncientDiscriminator = 0; @@ -12149,7 +12149,7 @@ void SetCharacterClass(CHARACTER* c) if (p[EQUIPMENT_GLOVES].Type == -1) { - c->BodyPart[BODYPART_GLOVES].Type = MODEL_BODY_GLOVES + c->SkinIndex; + c->BodyPart[BODYPART_GLOVES].Type = static_cast(MODEL_BODY_GLOVES) + c->SkinIndex; c->BodyPart[BODYPART_GLOVES].Level = 0; c->BodyPart[BODYPART_GLOVES].ExcellentFlags = 0; c->BodyPart[BODYPART_GLOVES].AncientDiscriminator = 0; @@ -12164,7 +12164,7 @@ void SetCharacterClass(CHARACTER* c) if (p[EQUIPMENT_BOOTS].Type == -1) { - c->BodyPart[BODYPART_BOOTS].Type = MODEL_BODY_BOOTS + c->SkinIndex; + c->BodyPart[BODYPART_BOOTS].Type = static_cast(MODEL_BODY_BOOTS) + c->SkinIndex; c->BodyPart[BODYPART_BOOTS].Level = 0; c->BodyPart[BODYPART_BOOTS].ExcellentFlags = 0; c->BodyPart[BODYPART_BOOTS].AncientDiscriminator = 0; @@ -12205,35 +12205,35 @@ void SetChangeClass(CHARACTER* c) if (c->BodyPart[BODYPART_HELM].Type >= MODEL_BODY_HELM) { - c->BodyPart[BODYPART_HELM].Type = MODEL_BODY_HELM + c->SkinIndex; + c->BodyPart[BODYPART_HELM].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; c->BodyPart[BODYPART_HELM].Level = 0; c->BodyPart[BODYPART_HELM].ExcellentFlags = 0; c->BodyPart[BODYPART_HELM].AncientDiscriminator = 0; } if (c->BodyPart[BODYPART_ARMOR].Type >= MODEL_BODY_ARMOR) { - c->BodyPart[BODYPART_ARMOR].Type = MODEL_BODY_ARMOR + c->SkinIndex; + c->BodyPart[BODYPART_ARMOR].Type = static_cast(MODEL_BODY_ARMOR) + c->SkinIndex; c->BodyPart[BODYPART_ARMOR].Level = 0; c->BodyPart[BODYPART_ARMOR].ExcellentFlags = 0; c->BodyPart[BODYPART_ARMOR].AncientDiscriminator = 0; } if (c->BodyPart[BODYPART_PANTS].Type >= MODEL_BODY_PANTS) { - c->BodyPart[BODYPART_PANTS].Type = MODEL_BODY_PANTS + c->SkinIndex; + c->BodyPart[BODYPART_PANTS].Type = static_cast(MODEL_BODY_PANTS) + c->SkinIndex; c->BodyPart[BODYPART_PANTS].Level = 0; c->BodyPart[BODYPART_PANTS].ExcellentFlags = 0; c->BodyPart[BODYPART_PANTS].AncientDiscriminator = 0; } if (c->BodyPart[BODYPART_GLOVES].Type >= MODEL_BODY_GLOVES) { - c->BodyPart[BODYPART_GLOVES].Type = MODEL_BODY_GLOVES + c->SkinIndex; + c->BodyPart[BODYPART_GLOVES].Type = static_cast(MODEL_BODY_GLOVES) + c->SkinIndex; c->BodyPart[BODYPART_GLOVES].Level = 0; c->BodyPart[BODYPART_GLOVES].ExcellentFlags = 0; c->BodyPart[BODYPART_GLOVES].AncientDiscriminator = 0; } if (c->BodyPart[BODYPART_BOOTS].Type >= MODEL_BODY_BOOTS) { - c->BodyPart[BODYPART_BOOTS].Type = MODEL_BODY_BOOTS + c->SkinIndex; + c->BodyPart[BODYPART_BOOTS].Type = static_cast(MODEL_BODY_BOOTS) + c->SkinIndex; c->BodyPart[BODYPART_BOOTS].Level = 0; c->BodyPart[BODYPART_BOOTS].ExcellentFlags = 0; c->BodyPart[BODYPART_BOOTS].AncientDiscriminator = 0; @@ -12383,7 +12383,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* } else { - if (gCharacterManager.GetBaseClass(c->Class) == CLASS_DARK_LORD && ((MODEL_LEGENDARY_STAFF) - MODEL_SWORD) == ExtType) + if (gCharacterManager.GetBaseClass(c->Class) == CLASS_DARK_LORD && (static_cast(MODEL_LEGENDARY_STAFF) - MODEL_SWORD) == ExtType) { ITEM* pEquipmentItemSlot = &CharacterMachine->Equipment[EQUIPMENT_WEAPON_LEFT]; PET_INFO* pPetInfo = giPetManager::GetPetInfo(pEquipmentItemSlot); @@ -12603,7 +12603,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* ExtType = (Equipment[2] >> 4) + ((Equipment[8] >> 7) & 1) * 16 + (Equipment[12] & 15) * 32; if (ExtType == 0x1FF) { - c->BodyPart[BODYPART_HELM].Type = MODEL_BODY_HELM + c->SkinIndex; + c->BodyPart[BODYPART_HELM].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; c->BodyPart[BODYPART_HELM].Level = 0; c->BodyPart[BODYPART_HELM].ExcellentFlags = 0; c->BodyPart[BODYPART_HELM].AncientDiscriminator = 0; @@ -12620,7 +12620,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* ExtType = (Equipment[2] & 15) + ((Equipment[8] >> 6) & 1) * 16 + ((Equipment[13] >> 4) & 15) * 32; if (ExtType == 0x1FF) { - c->BodyPart[BODYPART_ARMOR].Type = MODEL_BODY_ARMOR + c->SkinIndex; + c->BodyPart[BODYPART_ARMOR].Type = static_cast(MODEL_BODY_ARMOR) + c->SkinIndex; c->BodyPart[BODYPART_ARMOR].Level = 0; c->BodyPart[BODYPART_ARMOR].ExcellentFlags = 0; c->BodyPart[BODYPART_ARMOR].AncientDiscriminator = 0; @@ -12636,7 +12636,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* ExtType = (Equipment[3] >> 4) + ((Equipment[8] >> 5) & 1) * 16 + (Equipment[13] & 15) * 32; if (ExtType == 0x1FF) { - c->BodyPart[BODYPART_PANTS].Type = MODEL_BODY_PANTS + c->SkinIndex; + c->BodyPart[BODYPART_PANTS].Type = static_cast(MODEL_BODY_PANTS) + c->SkinIndex; c->BodyPart[BODYPART_PANTS].Level = 0; c->BodyPart[BODYPART_PANTS].ExcellentFlags = 0; c->BodyPart[BODYPART_PANTS].AncientDiscriminator = 0; @@ -12652,7 +12652,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* ExtType = (Equipment[3] & 15) + ((Equipment[8] >> 4) & 1) * 16 + ((Equipment[14] >> 4) & 15) * 32; if (ExtType == 0x1FF) { - c->BodyPart[BODYPART_GLOVES].Type = MODEL_BODY_GLOVES + c->SkinIndex; + c->BodyPart[BODYPART_GLOVES].Type = static_cast(MODEL_BODY_GLOVES) + c->SkinIndex; c->BodyPart[BODYPART_GLOVES].Level = 0; c->BodyPart[BODYPART_GLOVES].ExcellentFlags = 0; c->BodyPart[BODYPART_GLOVES].AncientDiscriminator = 0; @@ -12668,7 +12668,7 @@ void ChangeCharacterExt(int Key, BYTE* Equipment, CHARACTER* pCharacter, OBJECT* ExtType = (Equipment[4] >> 4) + ((Equipment[8] >> 3) & 1) * 16 + (Equipment[14] & 15) * 32; if (ExtType == 0x1FF) { - c->BodyPart[BODYPART_BOOTS].Type = MODEL_BODY_BOOTS + c->SkinIndex; + c->BodyPart[BODYPART_BOOTS].Type = static_cast(MODEL_BODY_BOOTS) + c->SkinIndex; c->BodyPart[BODYPART_BOOTS].Level = 0; c->BodyPart[BODYPART_BOOTS].ExcellentFlags = 0; c->BodyPart[BODYPART_BOOTS].AncientDiscriminator = 0; @@ -14933,11 +14933,11 @@ CHARACTER* CreateHero(int Index, CLASS_TYPE Class, int Skin, float x, float y, f } else { - c->BodyPart[BODYPART_HELM].Type = MODEL_BODY_HELM + c->SkinIndex; - c->BodyPart[BODYPART_ARMOR].Type = MODEL_BODY_ARMOR + c->SkinIndex; - c->BodyPart[BODYPART_PANTS].Type = MODEL_BODY_PANTS + c->SkinIndex; - c->BodyPart[BODYPART_GLOVES].Type = MODEL_BODY_GLOVES + c->SkinIndex; - c->BodyPart[BODYPART_BOOTS].Type = MODEL_BODY_BOOTS + c->SkinIndex; + c->BodyPart[BODYPART_HELM].Type = static_cast(MODEL_BODY_HELM) + c->SkinIndex; + c->BodyPart[BODYPART_ARMOR].Type = static_cast(MODEL_BODY_ARMOR) + c->SkinIndex; + c->BodyPart[BODYPART_PANTS].Type = static_cast(MODEL_BODY_PANTS) + c->SkinIndex; + c->BodyPart[BODYPART_GLOVES].Type = static_cast(MODEL_BODY_GLOVES) + c->SkinIndex; + c->BodyPart[BODYPART_BOOTS].Type = static_cast(MODEL_BODY_BOOTS) + c->SkinIndex; c->Weapon[0].Type = -1; c->Weapon[1].Type = -1; c->Wing.Type = -1; diff --git a/src/source/ZzzEffect.cpp b/src/source/ZzzEffect.cpp index e63eb44ed..cbf2d60e2 100644 --- a/src/source/ZzzEffect.cpp +++ b/src/source/ZzzEffect.cpp @@ -15,7 +15,7 @@ #include "UIManager.h" #include "CDirection.h" #include "MapManager.h" -#include "SkillEffectMgr.h"] +#include "SkillEffectMgr.h" #include "CharacterManager.h" #include "SkillManager.h" #include @@ -370,7 +370,7 @@ void CreateEffect(int Type, vec3_t Position, vec3_t Angle, vec3_t Light, int Sub o->PKKey = PKKey; o->Kind = Skill; o->Skill = SkillIndex; - o->RenderType = NULL; + o->RenderType = 0; o->AttackPoint[0] = 0; o->CurrentAction = 0; o->m_bySkillSerialNum = (BYTE)SkillSerialNum; @@ -8339,7 +8339,7 @@ void MoveEffect(OBJECT* o, int iIndex) AngleMatrix(o->Owner->Angle, Matrix); VectorRotate(P, Matrix, dp); VectorAdd(dp, vFirePosition, Position); - CreateSprite(BITMAP_SHINY + 6, Position, 2.0f, o->Light, o, NULL, 1); + CreateSprite(BITMAP_SHINY + 6, Position, 2.0f, o->Light, o, 0, 1); } break; } @@ -18206,15 +18206,15 @@ void RenderEffects(bool bRenderBlendMesh) CreateSprite(BITMAP_SHOCK_WAVE, o->Position, 0.8f, vLight, o, -(o->m_iAnimation * 3.f)); // Flare1 Vector(0.8f, 0.6f, 0.f, vLight); - CreateSprite(BITMAP_LIGHT, o->Position, 5.0f, vLight, o, NULL); + CreateSprite(BITMAP_LIGHT, o->Position, 5.0f, vLight, o, 0); RenderObject(o); } else if (o->SubType == 1) { - CreateSprite(BITMAP_LIGHT, o->Position, 5.0f, o->Light, o, NULL); - CreateSprite(BITMAP_LIGHT, o->Position, 3.0f, o->Light, o, NULL); - CreateSprite(BITMAP_LIGHT, o->Position, 3.0f, o->Light, o, NULL); - CreateSprite(BITMAP_SHINY + 6, o->Position, 2.0f, o->Light, o, NULL); + CreateSprite(BITMAP_LIGHT, o->Position, 5.0f, o->Light, o, 0); + CreateSprite(BITMAP_LIGHT, o->Position, 3.0f, o->Light, o, 0); + CreateSprite(BITMAP_LIGHT, o->Position, 3.0f, o->Light, o, 0); + CreateSprite(BITMAP_SHINY + 6, o->Position, 2.0f, o->Light, o, 0); RenderObject(o); } diff --git a/src/source/ZzzInfomation.cpp b/src/source/ZzzInfomation.cpp index b5001e7a9..6a7716bb6 100644 --- a/src/source/ZzzInfomation.cpp +++ b/src/source/ZzzInfomation.cpp @@ -93,7 +93,7 @@ void OpenFilterFile(const wchar_t* FileName) { BuxConvert(pSeek, Size); memcpy(AbuseFilter[i], pSeek, Size); - if (AbuseFilter[i][0] == NULL) + if (AbuseFilter[i][0] == 0) { AbuseFilterNumber = i; break; @@ -141,7 +141,7 @@ void OpenNameFilterFile(const wchar_t* FileName) { BuxConvert(pSeek, Size); memcpy(AbuseNameFilter[i], pSeek, Size); - if (AbuseNameFilter[i][0] == NULL) + if (AbuseNameFilter[i][0] == 0) { AbuseNameFilterNumber = i; break; @@ -234,7 +234,7 @@ void OpenNpcScript(wchar_t* FileName) { Token = (*GetToken)(); if (Token == END) break; - if (Token == NAME && strcmp("end", TokenString) == NULL) break; + if (Token == NAME && strcmp("end", TokenString) == 0) break; if (Token == NUMBER) { int Type, x, y, Dir; @@ -342,7 +342,7 @@ void PrintItem(wchar_t* FileName) fwprintf(fp, L"------------------------------------------------------------------------------------------------------\n"); } ITEM_ATTRIBUTE* p = &ItemAttribute[i]; - if (p->Name[0] != NULL) + if (p->Name[0] != 0) { int Plus; if (i >= 12 * MAX_ITEM_INDEX) @@ -2401,7 +2401,7 @@ void OpenMonsterScript(wchar_t* FileName) { SMDToken token = GetToken(); if (token == END) break; - if (token == NAME && strcmp("end", TokenString) == NULL) break; + if (token == NAME && strcmp("end", TokenString) == 0) break; MONSTER_SCRIPT* m = &MonsterScript[EditMonsterNumber++]; m->Type = static_cast(TokenNumber); token = GetToken(); diff --git a/src/source/ZzzInterface.cpp b/src/source/ZzzInterface.cpp index dabc25a04..65a589393 100644 --- a/src/source/ZzzInterface.cpp +++ b/src/source/ZzzInterface.cpp @@ -234,7 +234,7 @@ void ClearInput(BOOL bClearWhisperTarget) { if (i == 1 && bClearWhisperTarget == FALSE) continue; for (int j = 0; j < 256; j++) - InputText[i][j] = NULL; + InputText[i][j] = 0; InputLength[i] = 0; InputTextHide[i] = 0; } @@ -397,7 +397,7 @@ void RenderInputText(int x, int y, int Index, int Gold) Text[i] = '*'; iTextSize = i; } - Text[iTextSize] = NULL; + Text[iTextSize] = 0; } else if (InputTextHide[Index] == 2) { @@ -412,7 +412,7 @@ void RenderInputText(int x, int y, int Index, int Gold) Text[i] = '*'; iTextSize = i; } - Text[iTextSize] = NULL; + Text[iTextSize] = 0; } else { @@ -920,7 +920,7 @@ void RenderBoolean(int x, int y, CHAT* c) if (c->x <= MouseX && MouseX < (int)(c->x + c->Width * REFERENCE_WIDTH / WindowWidth) && c->y <= MouseY && MouseY < (int)(c->y + c->Height * REFERENCE_HEIGHT / WindowHeight) && - InputEnable && Hero->SafeZone && wcscmp(c->ID, Hero->ID) != NULL && + InputEnable && Hero->SafeZone && wcscmp(c->ID, Hero->ID) != 0 && (DWORD)WorldTime % 24 < 12) { unsigned int Temp = g_pRenderText->GetBgColor(); @@ -1062,7 +1062,7 @@ void AddGuildName(CHAT* c, CHARACTER* Owner) mu_swprintf(c->Union, L"<%ls>", GuildMark[Owner->GuildMarkIndex].UnionName); } else - c->Union[0] = NULL; + c->Union[0] = 0; if (Owner->GuildMarkIndex >= 0) { @@ -1082,7 +1082,7 @@ void AddGuildName(CHAT* c, CHARACTER* Owner) else { c->GuildColor = 0; - c->Guild[0] = NULL; + c->Guild[0] = 0; } } @@ -1172,7 +1172,7 @@ int CreateChat(wchar_t* character_name, const wchar_t* chat_text, OBJECT* Owner, wcscpy(c->ID, character_name); c->Color = Color; c->GuildColor = 0; - c->Guild[0] = NULL; + c->Guild[0] = 0; AddChat(c, chat_text, 0); c->LifeTime[0] = Flag; @@ -1192,7 +1192,7 @@ void AssignChat(wchar_t* character_name, const wchar_t* chat_text, int flag) OBJECT* o = &c->Object; if (o->Live && o->Kind == KIND_PLAYER) { - if (wcscmp(c->ID, character_name) == NULL) + if (wcscmp(c->ID, character_name) == 0) { CreateChat(character_name, chat_text, c, flag); return; @@ -1206,7 +1206,7 @@ void AssignChat(wchar_t* character_name, const wchar_t* chat_text, int flag) OBJECT* o = &c->Object; if (o->Live && o->Kind == KIND_MONSTER) { - if (wcscmp(c->ID, character_name) == NULL) + if (wcscmp(c->ID, character_name) == 0) { CreateChat(character_name, chat_text, c, flag); return; @@ -1411,11 +1411,11 @@ bool CheckAttack_Fenrir(CHARACTER* c) } else if (::IsStrifeMap(gMapManager.WorldActive) && c != Hero && c->m_byGensInfluence != Hero->m_byGensInfluence) { - if (((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) || (g_pPartyManager->IsPartyMember(SelectedCharacter))) && (HIBYTE(GetAsyncKeyState(VK_CONTROL)) == 128)) + if (((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) || (g_pPartyManager->IsPartyMember(SelectedCharacter))) && (HIBYTE(GetAsyncKeyState(VK_CONTROL)) == 128)) { return true; } - else if ((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) != NULL) && !g_pPartyManager->IsPartyMember(SelectedCharacter)) + else if ((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) != 0) && !g_pPartyManager->IsPartyMember(SelectedCharacter)) { return true; } @@ -1511,7 +1511,7 @@ bool CheckAttack_Fenrir(CHARACTER* c) } if (EnableGuildWar && c->PK >= PVP_MURDERER2 && c->GuildMarkIndex != -1 - && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) + && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) { return false; } @@ -1610,7 +1610,7 @@ bool CheckAttack() else return true; } - else if (wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) + else if (wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) { if (g_pPartyManager->IsPartyMember(SelectedCharacter)) { @@ -1747,7 +1747,7 @@ bool CheckAttack() } if (EnableGuildWar && c->PK >= PVP_MURDERER2 && c->GuildMarkIndex != -1 - && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) + && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) { return false; } @@ -1822,7 +1822,7 @@ int getTargetCharacterKey(CHARACTER* c, int selected) return sc->Key; } - if (EnableGuildWar && sc->PK >= PVP_MURDERER2 && sc->GuildMarkIndex != -1 && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[sc->GuildMarkIndex].GuildName) == NULL) + if (EnableGuildWar && sc->PK >= PVP_MURDERER2 && sc->GuildMarkIndex != -1 && wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[sc->GuildMarkIndex].GuildName) == 0) { return -1; } @@ -1859,7 +1859,7 @@ int getTargetCharacterKey(CHARACTER* c, int selected) return sc->Key; } - if ((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == NULL) || + if ((wcscmp(GuildMark[Hero->GuildMarkIndex].GuildName, GuildMark[c->GuildMarkIndex].GuildName) == 0) || g_pPartyManager->IsPartyMember(SelectedCharacter)) { if (HIBYTE(GetAsyncKeyState(VK_CONTROL)) == 128) @@ -2279,7 +2279,7 @@ void UseSkillWarrior(CHARACTER* c, OBJECT* o) else { auto baseSkill = gSkillManager.MasterSkillToBaseSkillIndex(Skill); - SetAction(o, PLAYER_ATTACK_SKILL_SWORD1 + baseSkill - AT_SKILL_FALLING_SLASH); + SetAction(o, static_cast(PLAYER_ATTACK_SKILL_SWORD1) + baseSkill - AT_SKILL_FALLING_SLASH); } break; } @@ -3303,20 +3303,15 @@ void Action(CHARACTER* c, OBJECT* o, bool Now) if (ActionTarget == -1) return; - if (o->Type == MODEL_PLAYER) - { - if (o->CurrentAction >= PLAYER_ATTACK_FIST && o->CurrentAction <= PLAYER_RIDE_SKILL - && o->CurrentAction != PLAYER_STOP_RIDE_HORSE - && o->CurrentAction != PLAYER_STOP_TWO_HAND_SWORD_TWO - && o->CurrentAction == PLAYER_FENRIR_SKILL_ONE_RIGHT - && o->CurrentAction == PLAYER_RAGE_FENRIR_ONE_RIGHT) - break; - } - else - { - if (o->CurrentAction >= MONSTER01_ATTACK1 && o->CurrentAction <= MONSTER01_ATTACK2) - break; - } + // To debounce repeat left-clicks while a swing animation is still + // playing, gate on a small *include* list of the actual swing + // animations -- never a `>= … <=` range, which would also sweep in + // idle/locomotion frames and lock out attacks while mounted. e.g.: + // + // if (o->CurrentAction == PLAYER_ATTACK_FIST + // || o->CurrentAction == PLAYER_ATTACK_SWORD_RIGHT1 + // || ... ) + // break; if (ActionTarget <= -1) break; @@ -4005,11 +4000,11 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) Name[i] = Text[i]; iTextSize = i; } - Name[iTextSize] = NULL; + Name[iTextSize] = 0; if (!g_pNewUISystem->IsVisible(SEASON3B::INTERFACE_STORAGE)) { - if (wcscmp(Name, GlobalText[258]) == NULL || wcscmp(Name, GlobalText[259]) == NULL || wcsicmp(Text, L"/trade") == NULL) + if (wcscmp(Name, GlobalText[258]) == 0 || wcscmp(Name, GlobalText[259]) == 0 || wcsicmp(Text, L"/trade") == 0) { if (gMapManager.InChaosCastle() == true) { @@ -4262,7 +4257,7 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) SocketClient->ToGameServer()->SendDuelStopRequest(); } } - if (wcscmp(Text, GlobalText[254]) == NULL || wcsicmp(Text, L"/guild") == NULL) + if (wcscmp(Text, GlobalText[254]) == 0 || wcsicmp(Text, L"/guild") == 0) { if (gMapManager.InChaosCastle() == true) { @@ -4391,14 +4386,14 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) } return true; } - if (wcscmp(Text, GlobalText[256]) == NULL || wcsicmp(Text, L"/party") == NULL || wcsicmp(Text, L"/pt") == NULL) + if (wcscmp(Text, GlobalText[256]) == 0 || wcsicmp(Text, L"/party") == 0 || wcsicmp(Text, L"/pt") == 0) { if (gMapManager.InChaosCastle() == true) { g_pSystemLogBox->AddText(GlobalText[1150], SEASON3B::TYPE_SYSTEM_MESSAGE); return false; } - if (PartyNumber > 0 && wcscmp(Party[0].Name, Hero->ID) != NULL) + if (PartyNumber > 0 && wcscmp(Party[0].Name, Hero->ID) != 0) { g_pSystemLogBox->AddText(GlobalText[257], SEASON3B::TYPE_SYSTEM_MESSAGE); return true; @@ -4438,7 +4433,7 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) } return true; } - if (wcsicmp(Text, L"/charactername") == NULL) + if (wcsicmp(Text, L"/charactername") == 0) { if (IsGMCharacter() == true) { @@ -4467,15 +4462,15 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) MacroText[i][j - 3] = Text[j]; iTextSize = j; } - MacroText[i][iTextSize - 3] = NULL; + MacroText[i][iTextSize - 3] = 0; PlayBuffer(SOUND_CLICK01); return true; } } wchar_t lpszFilter[] = L"/filter"; - if ((GlobalText.GetStringSize(753) > 0 && wcsncmp(Text, GlobalText[753], GlobalText.GetStringSize(753)) == NULL) - || (wcsncmp(Text, lpszFilter, wcslen(lpszFilter)) == NULL)) + if ((GlobalText.GetStringSize(753) > 0 && wcsncmp(Text, GlobalText[753], GlobalText.GetStringSize(753)) == 0) + || (wcsncmp(Text, lpszFilter, wcslen(lpszFilter)) == 0)) { g_pChatListBox->SetFilterText(Text); } @@ -4516,7 +4511,7 @@ bool CheckCommand(wchar_t* Text, bool bMacroText) wchar_t Name[256]; mu_swprintf(Name, L"/%ls", p->Name); - if (wcsicmp(Text, Name) == NULL) + if (wcsicmp(Text, Name) == 0) { g_csItemOption.ClearOptionHelper(); @@ -5246,7 +5241,7 @@ void AttackKnight(CHARACTER* c, ActionSkillType Skill, float Distance) || Skill == AT_SKILL_EARTHSHAKE_STR || Skill == AT_SKILL_EARTHSHAKE_MASTERY || Skill == AT_SKILL_RIDER - || (Skill >= AT_PET_COMMAND_DEFAULT && Skill <= AT_PET_COMMAND_TARGET) + || (static_cast(Skill) >= static_cast(AT_PET_COMMAND_DEFAULT) && static_cast(Skill) <= static_cast(AT_PET_COMMAND_TARGET)) || Skill == AT_SKILL_PLASMA_STORM_FENRIR ) { diff --git a/src/source/ZzzInventory.cpp b/src/source/ZzzInventory.cpp index 1289f93a6..1ae7bd63b 100644 --- a/src/source/ZzzInventory.cpp +++ b/src/source/ZzzInventory.cpp @@ -2129,7 +2129,7 @@ void RenderItemInfo(int sx, int sy, ITEM* ip, bool Sell, int Inventype, bool bIt ZeroMemory(TextListColor, 20 * sizeof(int)); for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } if (!Sell && (ip->Type == ITEM_DARK_HORSE_ITEM || ip->Type == ITEM_DARK_RAVEN_ITEM)) @@ -4755,7 +4755,7 @@ void RenderItemInfo(int sx, int sy, ITEM* ip, bool Sell, int Inventype, bool bIt } else if (ip->Type >= ITEM_TYPE_CHARM_MIXWING + EWS_BEGIN && ip->Type <= ITEM_TYPE_CHARM_MIXWING + EWS_END) { - mu_swprintf(TextList[TextNum], GlobalText[2732 + (ip->Type - (MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN))]); + mu_swprintf(TextList[TextNum], L"%ls", GlobalText[2732 + (ip->Type - (ITEM_TYPE_CHARM_MIXWING + EWS_BEGIN))]); Success = true; } @@ -5028,11 +5028,11 @@ void RenderItemInfo(int sx, int sy, ITEM* ip, bool Sell, int Inventype, bool bIt } } if ((ip->Type >= MODEL_STAFF - MODEL_ITEM && ip->Type < MODEL_STAFF + MAX_ITEM_INDEX - MODEL_ITEM) - || (ip->Type == (MODEL_RUNE_BLADE - MODEL_ITEM)) - || (ip->Type == (MODEL_EXPLOSION_BLADE - MODEL_ITEM)) - || (ip->Type == (MODEL_SWORD_DANCER - MODEL_ITEM)) - || (ip->Type == (MODEL_DARK_REIGN_BLADE - MODEL_ITEM)) - || (ip->Type == (MODEL_IMPERIAL_SWORD - MODEL_ITEM)) + || (ip->Type == (static_cast(MODEL_RUNE_BLADE) - MODEL_ITEM)) + || (ip->Type == (static_cast(MODEL_EXPLOSION_BLADE) - MODEL_ITEM)) + || (ip->Type == (static_cast(MODEL_SWORD_DANCER) - MODEL_ITEM)) + || (ip->Type == (static_cast(MODEL_DARK_REIGN_BLADE) - MODEL_ITEM)) + || (ip->Type == (static_cast(MODEL_IMPERIAL_SWORD) - MODEL_ITEM)) ) { mu_swprintf(TextList[TextNum], L"\n"); TextNum++; SkipNum++; @@ -5665,7 +5665,7 @@ void RenderRepairInfo(int sx, int sy, ITEM* ip, bool Sell) { return; } - if (ip->Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN && ip->Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + if (ip->Type >= ITEM_TYPE_CHARM_MIXWING + EWS_BEGIN && ip->Type <= ITEM_TYPE_CHARM_MIXWING + EWS_END) { return; } @@ -5777,7 +5777,7 @@ void RenderRepairInfo(int sx, int sy, ITEM* ip, bool Sell) SkipNum = 0; for (int i = 0; i < 30; i++) { - TextList[i][0] = NULL; + TextList[i][0] = 0; } int Level = ip->Level; @@ -6984,11 +6984,11 @@ void BuildGroundItemLabelDescriptor(OBJECT* o, ITEM* ip, GroundItemLabelDescript } else if (o->Type == MODEL_COMPILED_CELE) { - CopyGroundItemLabelText(descriptor.Name, ItemAttribute[MODEL_JEWEL_OF_BLESS - MODEL_ITEM].Name); + CopyGroundItemLabelText(descriptor.Name, ItemAttribute[static_cast(MODEL_JEWEL_OF_BLESS) - MODEL_ITEM].Name); } else if (o->Type == MODEL_COMPILED_SOUL) { - CopyGroundItemLabelText(descriptor.Name, ItemAttribute[MODEL_JEWEL_OF_SOUL - MODEL_ITEM].Name); + CopyGroundItemLabelText(descriptor.Name, ItemAttribute[static_cast(MODEL_JEWEL_OF_SOUL) - MODEL_ITEM].Name); } else if (o->Type == MODEL_BOX_OF_LUCK && ItemLevel == 7) { @@ -7224,8 +7224,8 @@ void BuildGroundItemLabelDescriptor(OBJECT* o, ITEM* ip, GroundItemLabelDescript { SetDescriptorTextColor(descriptor, 0.6f, 0.4f, 1.0f); } - else if (o->Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN - && o->Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + else if (o->Type >= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_BEGIN + && o->Type <= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_END) { SetDescriptorOrangeTextColor(descriptor); } @@ -9357,7 +9357,7 @@ void RenderObjectScreen(int Type, int ItemLevel, int excellentFlags, int ancient ObjectSelect.Angle[1] = WorldTime * 0.2f; } } - else if (Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN && Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + else if (Type >= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_BEGIN && Type <= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_END) { Position[1] -= 0.03f; Vector(-90.f, 0.f, 0.f, ObjectSelect.Angle); @@ -10277,8 +10277,8 @@ void RenderObjectScreen(int Type, int ItemLevel, int excellentFlags, int ancient Scale = 0.0025f; } - if (Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN - && Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + if (Type >= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_BEGIN + && Type <= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_END) { Scale = 0.0020f; } diff --git a/src/source/ZzzLodTerrain.cpp b/src/source/ZzzLodTerrain.cpp index 1486bd5a5..a4457ac4e 100644 --- a/src/source/ZzzLodTerrain.cpp +++ b/src/source/ZzzLodTerrain.cpp @@ -627,7 +627,7 @@ bool OpenTerrainHeight(wchar_t* filename) for (int i = 0; i < (int)wcslen(filename); i++) { NewFileName[i] = filename[i]; - NewFileName[i + 1] = NULL; + NewFileName[i + 1] = 0; if (filename[i] == '.') break; } @@ -757,7 +757,7 @@ bool OpenTerrainHeightNew(const wchar_t* strFilename) for (int i = 0; i < (int)wcslen(strFilename); ++i) { NewFileName[i] = strFilename[i]; - NewFileName[i + 1] = NULL; + NewFileName[i + 1] = 0; if (strFilename[i] == '.') break; diff --git a/src/source/ZzzObject.cpp b/src/source/ZzzObject.cpp index d4140eeaf..2e38692af 100644 --- a/src/source/ZzzObject.cpp +++ b/src/source/ZzzObject.cpp @@ -5877,7 +5877,7 @@ void ItemAngle(OBJECT* o) // o->Angle[2] = 0.0f; o->Scale = 1.0f; } - else if (o->Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN && o->Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + else if (o->Type >= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_BEGIN && o->Type <= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_END) { o->Scale = 0.5f; o->Angle[2] = 90.f; @@ -8636,7 +8636,7 @@ void RenderPartObjectBody(BMD* b, OBJECT* o, int Type, float Alpha, int RenderTy { b->RenderMesh(0, RENDER_TEXTURE, o->Alpha, o->BlendMesh, o->BlendMeshLight, o->BlendMeshTexCoordU, o->BlendMeshTexCoordV); } - else if (o->Type >= MODEL_TYPE_CHARM_MIXWING + EWS_BEGIN && o->Type <= MODEL_TYPE_CHARM_MIXWING + EWS_END) + else if (o->Type >= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_BEGIN && o->Type <= static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_END) { b->RenderBody(RENDER_TEXTURE, o->Alpha, o->BlendMesh, o->BlendMeshLight, o->BlendMeshTexCoordU, o->BlendMeshTexCoordV, o->HiddenMesh); } diff --git a/src/source/ZzzOpenData.cpp b/src/source/ZzzOpenData.cpp index dd2c33465..c2e72f305 100644 --- a/src/source/ZzzOpenData.cpp +++ b/src/source/ZzzOpenData.cpp @@ -53,7 +53,7 @@ void OpenModel(int Type, wchar_t* Dir, wchar_t* ModelFileName, ...) while (1) { wchar_t* Temp = va_arg(Marker, wchar_t*); - if (Temp == NULL || wcscmp(Temp, L"end") == NULL) + if (Temp == nullptr || wcscmp(Temp, L"end") == 0) { break; } @@ -766,16 +766,16 @@ void OpenItems() wchar_t szPC6Path[24]; mu_swprintf(szPC6Path, L"Data\\Item\\partCharge6\\"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_KNIGHT_1_CHARM, szPC6Path, L"amulet_satan"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_MAGICIAN_1_CHARM, szPC6Path, L"amulet_sky"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_ELF_1_CHARM, szPC6Path, L"amulet_elf"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_SUMMONER_1_CHARM, szPC6Path, L"amulet_disaster"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_DARKLORD_1_CHARM, szPC6Path, L"amulet_cloak"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_KNIGHT_2_CHARM, szPC6Path, L"amulet_dragon"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_MAGICIAN_2_CHARM, szPC6Path, L"amulet_soul"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_ELF_2_CHARM, szPC6Path, L"amulet_spirit"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_SUMMONER_2_CHARM, szPC6Path, L"amulet_despair"); - gLoadData.AccessModel(MODEL_TYPE_CHARM_MIXWING + EWS_DARKKNIGHT_2_CHARM, szPC6Path, L"amulet_dark"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_KNIGHT_1_CHARM, szPC6Path, L"amulet_satan"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_MAGICIAN_1_CHARM, szPC6Path, L"amulet_sky"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_ELF_1_CHARM, szPC6Path, L"amulet_elf"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_SUMMONER_1_CHARM, szPC6Path, L"amulet_disaster"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_DARKLORD_1_CHARM, szPC6Path, L"amulet_cloak"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_KNIGHT_2_CHARM, szPC6Path, L"amulet_dragon"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_MAGICIAN_2_CHARM, szPC6Path, L"amulet_soul"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_ELF_2_CHARM, szPC6Path, L"amulet_spirit"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_SUMMONER_2_CHARM, szPC6Path, L"amulet_despair"); + gLoadData.AccessModel(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_DARKKNIGHT_2_CHARM, szPC6Path, L"amulet_dark"); gLoadData.AccessModel(MODEL_HELPER + 59, L"Data\\Item\\partCharge2\\", L"sealmove"); gLoadData.AccessModel(MODEL_HELPER + 54, L"Data\\Item\\partCharge2\\", L"resetfruit_power"); gLoadData.AccessModel(MODEL_HELPER + 55, L"Data\\Item\\partCharge2\\", L"resetfruit_quick"); @@ -1496,17 +1496,17 @@ void OpenItemTextures() gLoadData.OpenTexture(MODEL_POTION + 75, L"Item\\partCharge2\\"); gLoadData.OpenTexture(MODEL_POTION + 76, L"Item\\partCharge2\\"); gLoadData.OpenTexture(MODEL_POTION + 77, L"Item\\partCharge2\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_KNIGHT_1_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_MAGICIAN_1_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_ELF_1_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_SUMMONER_1_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_DARKLORD_1_CHARM, L"Item\\partCharge6\\"); - - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_KNIGHT_2_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_MAGICIAN_2_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_ELF_2_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_SUMMONER_2_CHARM, L"Item\\partCharge6\\"); - gLoadData.OpenTexture(MODEL_TYPE_CHARM_MIXWING + EWS_DARKKNIGHT_2_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_KNIGHT_1_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_MAGICIAN_1_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_ELF_1_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_SUMMONER_1_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_DARKLORD_1_CHARM, L"Item\\partCharge6\\"); + + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_KNIGHT_2_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_MAGICIAN_2_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_ELF_2_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_SUMMONER_2_CHARM, L"Item\\partCharge6\\"); + gLoadData.OpenTexture(static_cast(MODEL_TYPE_CHARM_MIXWING) + EWS_DARKKNIGHT_2_CHARM, L"Item\\partCharge6\\"); gLoadData.OpenTexture(MODEL_HELPER + 59, L"Item\\partCharge2\\"); @@ -2123,7 +2123,7 @@ void OpenNpc(int Type) int _index = 9; int _index_end = 14; - Models[Type].Textures->FileName[_index_end] = NULL; + Models[Type].Textures->FileName[_index_end] = 0; for (int i = _index_end - 1; i > _index; i--) { Models[Type].Textures->FileName[i] = Models[Type].Textures->FileName[i - 1]; @@ -2317,7 +2317,7 @@ void OpenMonsterModel(EMonsterModelType Type) { g_ErrorReport.Write(L"OpenMonsterModel(%d)\r\n", Type); - int Index = MODEL_MONSTER01 + Type; + int Index = static_cast(MODEL_MONSTER01) + Type; BMD* b = &Models[Index]; if (b->NumActions > 0 || b->NumMeshs > 0) return; @@ -3131,14 +3131,14 @@ void OpenMonsterModel(EMonsterModelType Type) case MONSTER_MODEL_CHAOSCASTLE_KNIGHT: case MONSTER_MODEL_CHAOSCASTLE_ELF: LoadWaveFile(SOUND_MONSTER_ORCCAPATTACK1, L"Data\\Sound\\mOrcCapAttack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 161, 161, -1); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 161, 161, -1); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_CHAOSCASTLE_WIZARD: LoadWaveFile(SOUND_MONSTER_ORCARCHERATTACK1, L"Data\\Sound\\mOrcArcherAttack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 162, 162, -1); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 162, 162, -1); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_BULL_FIGHTER: case MONSTER_MODEL_DEATH_COW: @@ -3147,8 +3147,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_BULLATTACK1, L"Data\\Sound\\mBullAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BULLATTACK2, L"Data\\Sound\\mBullAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BULLDIE, L"Data\\Sound\\mBullDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 0, 1, 2, 3, 4); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 0, 1, 2, 3, 4); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_HOUND: LoadWaveFile(SOUND_MONSTER_HOUND1, L"Data\\Sound\\mHound1.wav", Channel, Enable); @@ -3156,19 +3156,19 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_HOUNDATTACK1, L"Data\\Sound\\mHoundAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HOUNDATTACK2, L"Data\\Sound\\mHoundAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HOUNDDIE, L"Data\\Sound\\mHoundDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 5, 6, 7, 8, 9); - Models[MODEL_MONSTER01 + Type].BoneHead = 5; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 5, 6, 7, 8, 9); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 5; break; case MONSTER_MODEL_BUDGE_DRAGON: LoadWaveFile(SOUND_MONSTER_BUDGE1, L"Data\\Sound\\mBudge1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BUDGEATTACK1, L"Data\\Sound\\mBudgeAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BUDGEDIE, L"Data\\Sound\\mBudgeDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 10, 11, 11, 11, 12); - Models[MODEL_MONSTER01 + Type].BoneHead = 7; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 10, 11, 11, 11, 12); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 7; break; case MONSTER_MODEL_SPIDER: LoadWaveFile(SOUND_MONSTER_SPIDER1, L"Data\\Sound\\mSpider1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 13, 13, 13, 13, 13); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 13, 13, 13, 13, 13); break; case MONSTER_MODEL_DARK_KNIGHT: case MONSTER_MODEL_DEATH_KNIGHT: @@ -3178,13 +3178,13 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_DARKKNIGHTATTACK1, L"Data\\Sound\\mDarkKnightAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DARKKNIGHTATTACK2, L"Data\\Sound\\mDarkKnightAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DARKKNIGHTDIE, L"Data\\Sound\\mDarkKnightDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 15, 16, 17, 18, 19); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 15, 16, 17, 18, 19); if (Type == 3) - Models[MODEL_MONSTER01 + Type].BoneHead = 16; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 16; else if (Type == 29) - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; else - Models[MODEL_MONSTER01 + Type].BoneHead = 19; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 19; break; case MONSTER_MODEL_LICH: LoadWaveFile(SOUND_MONSTER_WIZARD1, L"Data\\Sound\\mWizard1.wav", Channel, Enable); @@ -3192,8 +3192,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_WIZARDATTACK1, L"Data\\Sound\\mWizardAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WIZARDATTACK2, L"Data\\Sound\\mWizardAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WIZARDDIE, L"Data\\Sound\\mWizardDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 20, 21, 22, 23, 24); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 20, 21, 22, 23, 24); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_GIANT: LoadWaveFile(SOUND_MONSTER_GIANT1, L"Data\\Sound\\mGiant1.wav", Channel, Enable); @@ -3201,20 +3201,20 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GIANTATTACK1, L"Data\\Sound\\mGiantAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GIANTATTACK2, L"Data\\Sound\\mGiantAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GIANTDIE, L"Data\\Sound\\mGiantDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 25, 26, 27, 28, 29); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 25, 26, 27, 28, 29); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_LARVA: LoadWaveFile(SOUND_MONSTER_LARVA1, L"Data\\Sound\\mLarva1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LARVA2, L"Data\\Sound\\mLarva2.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 30, 31, 30, 31, 31); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 30, 31, 30, 31, 31); break; case MONSTER_MODEL_HELL_SPIDER: LoadWaveFile(SOUND_MONSTER_HELLSPIDER1, L"Data\\Sound\\mHellSpider1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HELLSPIDERATTACK1, L"Data\\Sound\\mHellSpiderAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HELLSPIDERDIE, L"Data\\Sound\\mHellSpiderDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 32, 33, 33, 33, 34); - Models[MODEL_MONSTER01 + Type].BoneHead = 16; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 32, 33, 33, 33, 34); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 16; break; case MONSTER_MODEL_GHOST: LoadWaveFile(SOUND_MONSTER_GHOST1, L"Data\\Sound\\mGhost1.wav", Channel, Enable); @@ -3222,8 +3222,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GHOSTATTACK1, L"Data\\Sound\\mGhostAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GHOSTATTACK2, L"Data\\Sound\\mGhostAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GHOSTDIE, L"Data\\Sound\\mGhostDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 35, 36, 37, 38, 39); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 35, 36, 37, 38, 39); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_CYCLOPS: LoadWaveFile(SOUND_MONSTER_OGRE1, L"Data\\Sound\\mOgre1.wav", Channel, Enable); @@ -3231,8 +3231,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_OGREATTACK1, L"Data\\Sound\\mOgreAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_OGREATTACK2, L"Data\\Sound\\mOgreAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_OGREDIE, L"Data\\Sound\\mOgreDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 40, 41, 42, 43, 44); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 40, 41, 42, 43, 44); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_GORGON: LoadWaveFile(SOUND_MONSTER_GORGON1, L"Data\\Sound\\mGorgon1.wav", Channel, Enable); @@ -3240,28 +3240,28 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GORGONATTACK1, L"Data\\Sound\\mGorgonAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GORGONATTACK2, L"Data\\Sound\\mGorgonAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GORGONDIE, L"Data\\Sound\\mGorgonDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 45, 46, 47, 48, 49); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 45, 46, 47, 48, 49); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_ICE_MONSTER: LoadWaveFile(SOUND_MONSTER_ICEMONSTER1, L"Data\\Sound\\mIceMonster1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ICEMONSTER2, L"Data\\Sound\\mIceMonster2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ICEMONSTERDIE, L"Data\\Sound\\mIceMonsterDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 50, 51, 50, 50, 52); - Models[MODEL_MONSTER01 + Type].BoneHead = 19; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 50, 51, 50, 50, 52); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 19; break; case MONSTER_MODEL_WORM: LoadWaveFile(SOUND_MONSTER_WORM1, L"Data\\Sound\\mWorm1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WORM2, L"Data\\Sound\\mWorm2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WORMDIE, L"Data\\Sound\\mWormDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 53, 53, 55, 55, 55); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 53, 53, 55, 55, 55); break; case MONSTER_MODEL_HOMMERD: LoadWaveFile(SOUND_MONSTER_HOMORD1, L"Data\\Sound\\mHomord1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HOMORD2, L"Data\\Sound\\mHomord2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HOMORDATTACK1, L"Data\\Sound\\mHomordAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HOMORDDIE, L"Data\\Sound\\mHomordDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 56, 57, 58, 58, 59); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 56, 57, 58, 58, 59); break; case MONSTER_MODEL_ICE_QUEEN: LoadWaveFile(SOUND_MONSTER_ICEQUEEN1, L"Data\\Sound\\mIceQueen1.wav", Channel, Enable); @@ -3269,15 +3269,15 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_ICEQUEENATTACK1, L"Data\\Sound\\mIceQueenAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ICEQUEENATTACK2, L"Data\\Sound\\mIceQueenAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ICEQUEENDIE, L"Data\\Sound\\mIceQueenDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 60, 61, 62, 63, 64); - Models[MODEL_MONSTER01 + Type].BoneHead = 16; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 60, 61, 62, 63, 64); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 16; break; case MONSTER_MODEL_ASSASSIN: LoadWaveFile(SOUND_MONSTER_ASSASSINATTACK1, L"Data\\Sound\\mAssassinAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ASSASSINATTACK2, L"Data\\Sound\\mAssassinAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ASSASSINDIE, L"Data\\Sound\\mAssassinDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 65, 66, 67); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 65, 66, 67); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; b->Actions[MONSTER01_STOP2].PlaySpeed = 0.35f; break; case MONSTER_MODEL_YETI: @@ -3297,8 +3297,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GOBLINATTACK1, L"Data\\Sound\\mGoblinAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOBLINATTACK2, L"Data\\Sound\\mGoblinAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOBLINDIE, L"Data\\Sound\\mGoblinDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 72, 73, 74, 75, 76); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 72, 73, 74, 75, 76); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_CHAIN_SCORPION: LoadWaveFile(SOUND_MONSTER_SCORPION1, L"Data\\Sound\\mScorpion1.wav", Channel, Enable); @@ -3306,14 +3306,14 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_SCORPIONATTACK1, L"Data\\Sound\\mScorpionAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SCORPIONATTACK2, L"Data\\Sound\\mScorpionAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SCORPIONDIE, L"Data\\Sound\\mScorpionDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 77, 78, 79, 80, 81); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 77, 78, 79, 80, 81); break; case MONSTER_MODEL_BEETLE_MONSTER: LoadWaveFile(SOUND_MONSTER_BEETLE1, L"Data\\Sound\\mBeetle1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BEETLEATTACK1, L"Data\\Sound\\mBeetleAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BEETLEDIE, L"Data\\Sound\\mBeetleDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 82, 82, 83, 83, 84); - Models[MODEL_MONSTER01 + Type].BoneHead = 5; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 82, 82, 83, 83, 84); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 5; break; case MONSTER_MODEL_HUNTER: LoadWaveFile(SOUND_MONSTER_HUNTER1, L"Data\\Sound\\mHunter1.wav", Channel, Enable); @@ -3321,8 +3321,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_HUNTERATTACK1, L"Data\\Sound\\mHunterAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HUNTERATTACK2, L"Data\\Sound\\mHunterAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HUNTERDIE, L"Data\\Sound\\mHunterDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 85, 86, 87, 88, 89); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 85, 86, 87, 88, 89); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_FOREST_MONSTER: LoadWaveFile(SOUND_MONSTER_WOODMON1, L"Data\\Sound\\mWoodMon1.wav", Channel, Enable); @@ -3330,8 +3330,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_WOODMONATTACK1, L"Data\\Sound\\mWoodMonAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WOODMONATTACK2, L"Data\\Sound\\mWoodMonAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_WOODMONDIE, L"Data\\Sound\\mWoodMonDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 90, 91, 92, 93, 94); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 90, 91, 92, 93, 94); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_AGON: LoadWaveFile(SOUND_MONSTER_ARGON1, L"Data\\Sound\\mArgon1.wav", Channel, Enable); @@ -3339,8 +3339,8 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_ARGONATTACK1, L"Data\\Sound\\mArgonAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ARGONATTACK2, L"Data\\Sound\\mArgonAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ARGONDIE, L"Data\\Sound\\mArgonDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 95, 96, 97, 98, 99); - Models[MODEL_MONSTER01 + Type].BoneHead = 16; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 95, 96, 97, 98, 99); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 16; break; case MONSTER_MODEL_STONE_GOLEM: LoadWaveFile(SOUND_MONSTER_GOLEM1, L"Data\\Sound\\mGolem1.wav", Channel, Enable); @@ -3348,15 +3348,15 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GOLEMATTACK1, L"Data\\Sound\\mGolemAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOLEMATTACK2, L"Data\\Sound\\mGolemAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOLEMDIE, L"Data\\Sound\\mGolemDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 100, 101, 102, 103, 104); - Models[MODEL_MONSTER01 + Type].BoneHead = 5; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 100, 101, 102, 103, 104); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 5; break; case MONSTER_MODEL_DEVIL: LoadWaveFile(SOUND_MONSTER_YETI1, L"Data\\Sound\\mYeti1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SATANATTACK1, L"Data\\Sound\\mSatanAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_YETIDIE, L"Data\\Sound\\mYetiDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 105, 105, 106, 106, 107); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 105, 105, 106, 106, 107); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_BALROG: LoadWaveFile(SOUND_MONSTER_BALROG1, L"Data\\Sound\\mBalrog1.wav", Channel, Enable); @@ -3364,9 +3364,9 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_WIZARDATTACK2, L"Data\\Sound\\mWizardAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GORGONATTACK2, L"Data\\Sound\\mGorgonAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BALROGDIE, L"Data\\Sound\\mBalrogDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 108, 109, 110, 111, 112); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; - Models[MODEL_MONSTER01 + Type].StreamMesh = 1; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 108, 109, 110, 111, 112); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; + Models[static_cast(MODEL_MONSTER01) + Type].StreamMesh = 1; break; case MONSTER_MODEL_SHADOW: LoadWaveFile(SOUND_MONSTER_SHADOW1, L"Data\\Sound\\mShadow1.wav", Channel, Enable); @@ -3374,14 +3374,14 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_SHADOWATTACK1, L"Data\\Sound\\mShadowAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SHADOWATTACK2, L"Data\\Sound\\mShadowAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SHADOWDIE, L"Data\\Sound\\mShadowDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 113, 114, 115, 116, 117); - Models[MODEL_MONSTER01 + Type].BoneHead = 5; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 113, 114, 115, 116, 117); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 5; break; case MONSTER_MODEL_DRAGON: LoadWaveFile(SOUND_MONSTER_YETI1, L"Data\\Sound\\mYeti1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BULLATTACK1, L"Data\\Sound\\mBullAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_YETIDIE, L"Data\\Sound\\mYetiDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 123, 123, 124, 124, 125); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 123, 123, 124, 124, 125); b->Actions[MONSTER01_ATTACK1].PlaySpeed = 0.5f; b->Actions[MONSTER01_ATTACK2].PlaySpeed = 0.7f; b->Actions[MONSTER01_STOP2].PlaySpeed = 0.8f; @@ -3392,7 +3392,7 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_BALI2, L"Data\\Sound\\mBali2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BALIATTACK1, L"Data\\Sound\\mBaliAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BALIATTACK2, L"Data\\Sound\\mBaliAttack2.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 126, 127, 128, 129, 127); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 126, 127, 128, 129, 127); b->Actions[MONSTER01_ATTACK3].PlaySpeed = 0.4f; b->Actions[MONSTER01_ATTACK4].PlaySpeed = 0.4f; b->Actions[MONSTER01_APEAR].PlaySpeed = 0.4f; @@ -3403,13 +3403,13 @@ void OpenMonsterModel(EMonsterModelType Type) case MONSTER_MODEL_BAHAMUT: LoadWaveFile(SOUND_MONSTER_BAHAMUT1, L"Data\\Sound\\mBahamut1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_YETI1, L"Data\\Sound\\mYeti1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 130, 130, 131, 131, 130); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 130, 130, 131, 131, 130); break; case MONSTER_MODEL_VEPAR: LoadWaveFile(SOUND_MONSTER_BEPAR1, L"Data\\Sound\\mBepar1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BEPAR2, L"Data\\Sound\\mBepar2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BALROG1, L"Data\\Sound\\mBalrog1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 132, 133, 104, 104, 133); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 132, 133, 104, 104, 133); b->Actions[MONSTER01_ATTACK1].PlaySpeed = 0.5f; b->Actions[MONSTER01_ATTACK2].PlaySpeed = 0.5f; b->BoneHead = 20;//인어 @@ -3418,24 +3418,24 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_VALKYRIE1, L"Data\\Sound\\mValkyrie1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BALIATTACK2, L"Data\\Sound\\mBaliAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_VALKYRIEDIE, L"Data\\Sound\\mValkyrieDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 135, 135, 136, 136, 137); - Models[MODEL_MONSTER01 + Type].BoneHead = 19; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 135, 135, 136, 136, 137); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 19; break; case MONSTER_MODEL_LIZARD: case MONSTER_MODEL_SOLDIER: LoadWaveFile(SOUND_MONSTER_LIZARDKING1, L"Data\\Sound\\mLizardKing1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LIZARDKING2, L"Data\\Sound\\mLizardKing2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GORGONDIE, L"Data\\Sound\\mGorgonDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 138, 139, 138, 139, 140); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 138, 139, 138, 139, 140); if (Type == 36) - Models[MODEL_MONSTER01 + Type].BoneHead = 19; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 19; else - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_HYDRA: LoadWaveFile(SOUND_MONSTER_HYDRA1, L"Data\\Sound\\mHydra1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_HYDRAATTACK1, L"Data\\Sound\\mHydraAttack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 141, 141, 142, 142, 141); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 141, 141, 142, 142, 141); b->Actions[MONSTER01_ATTACK1].PlaySpeed = 0.15f; b->Actions[MONSTER01_ATTACK2].PlaySpeed = 0.15f; b->Actions[MONSTER01_DIE].PlaySpeed = 0.2f; @@ -3443,8 +3443,8 @@ void OpenMonsterModel(EMonsterModelType Type) case MONSTER_MODEL_GOLDEN_WHEEL: LoadWaveFile(SOUND_MONSTER_IRON1, L"Data\\Sound\\iron1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_IRON_ATTACK1, L"Data\\Sound\\iron_attack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 143, 143, 144, 144, 144); - Models[MODEL_MONSTER01 + Type].BoneHead = 3; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 143, 143, 144, 144, 144); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 3; break; case MONSTER_MODEL_TANTALLOS: LoadWaveFile(SOUND_MONSTER_JAIKAN1, L"Data\\Sound\\jaikan1.wav", Channel, Enable); @@ -3452,52 +3452,52 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_JAIKAN_ATTACK1, L"Data\\Sound\\jaikan_attack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_JAIKAN_ATTACK2, L"Data\\Sound\\jaikan_attack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_JAIKAN_DIE, L"Data\\Sound\\jaikan_die.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 145, 146, 147, 148, 149); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 145, 146, 147, 148, 149); LoadBitmap(L"Monster\\bv01_2.jpg", BITMAP_MONSTER_SKIN, GL_LINEAR, GL_REPEAT); LoadBitmap(L"Monster\\bv02_2.jpg", BITMAP_MONSTER_SKIN + 1, GL_LINEAR, GL_REPEAT); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_BLOODY_WOLF: LoadWaveFile(SOUND_MONSTER_BLOOD1, L"Data\\Sound\\blood1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BLOOD_ATTACK1, L"Data\\Sound\\blood_attack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BLOOD_ATTACK2, L"Data\\Sound\\blood_attack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BLOOD_DIE, L"Data\\Sound\\blood_die.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 150, 150, 151, 152, 153); - Models[MODEL_MONSTER01 + Type].BoneHead = 7; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 150, 150, 151, 152, 153); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 7; break; case MONSTER_MODEL_BEAM_KNIGHT: LoadWaveFile(SOUND_MONSTER_DEATH1, L"Data\\Sound\\death1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DEATH_ATTACK1, L"Data\\Sound\\death_attack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DEATH_DIE, L"Data\\Sound\\death_die.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 154, 154, 155, 155, 156); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 154, 154, 155, 155, 156); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_MUTANT: LoadWaveFile(SOUND_MONSTER_UTANT1, L"Data\\Sound\\mutant1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_UTANT2, L"Data\\Sound\\mutant2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_UTANT_ATTACK1, L"Data\\Sound\\mutant_attack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 157, 158, 159, 159, 159); - Models[MODEL_MONSTER01 + Type].BoneHead = 6; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 157, 158, 159, 159, 159); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 6; break; case MONSTER_MODEL_ORC_ARCHER: LoadWaveFile(SOUND_MONSTER_ORCARCHERATTACK1, L"Data\\Sound\\mOrcArcherAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BULLDIE, L"Data\\Sound\\mBullDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 162, 162, 4); - Models[MODEL_MONSTER01 + Type].BoneHead = 7; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 162, 162, 4); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 7; break; case MONSTER_MODEL_ORC: LoadWaveFile(SOUND_MONSTER_HUNTER2, L"Data\\Sound\\mHunter2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BULLDIE, L"Data\\Sound\\mBullDie.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ORCCAPATTACK1, L"Data\\Sound\\mOrcCapAttack1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 86, 86, 161, 161, 4); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 86, 86, 161, 161, 4); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_CURSED_KING: LoadWaveFile(SOUND_MONSTER_CURSEDKING1, L"Data\\Sound\\mCursedKing1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_CURSEDKING2, L"Data\\Sound\\mCursedKing2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_CURSEDKINGDIE1, L"Data\\Sound\\mCursedKingDie1.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 160, 164, -1, -1, 163); - Models[MODEL_MONSTER01 + Type].BoneHead = 20; + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 160, 164, -1, -1, 163); + Models[static_cast(MODEL_MONSTER01) + Type].BoneHead = 20; break; case MONSTER_MODEL_CRUST: LoadBitmap(L"Monster\\iui02.tga", BITMAP_ROBE + 3); @@ -3506,49 +3506,49 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_MEGACRUST1, L"Data\\Sound\\mMegaCrust1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_MEGACRUSTATTACK1, L"Data\\Sound\\mMegaCrustAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_MEGACRUSTDIE, L"Data\\Sound\\mMegaCrustDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 180, 180, 181, 181, 182); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 180, 180, 181, 181, 182); break; case MONSTER_MODEL_MOLT: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; LoadWaveFile(SOUND_MONSTER_MOLT1, L"Data\\Sound\\mMolt1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_MOLTATTACK1, L"Data\\Sound\\mMoltAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_MOLTDIE, L"Data\\Sound\\mMoltDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 177, 177, 178, 178, 179); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 177, 177, 178, 178, 179); break; case MONSTER_MODEL_ALQUAMOS: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; //LoadWaveFile(SOUND_MONSTER+174,"Data\\Sound\\mAlquamos1.wav" ,Channel,Enable); LoadWaveFile(SOUND_MONSTER_ALQUAMOSATTACK1, L"Data\\Sound\\mAlquamosAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ALQUAMOSDIE, L"Data\\Sound\\mAlquamosDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 175, 175, 175, 175, 176); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 175, 175, 175, 175, 176); break; case MONSTER_MODEL_QUEEN_RAINER: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; LoadWaveFile(SOUND_MONSTER_RAINNER1, L"Data\\Sound\\mRainner1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_RAINNERATTACK1, L"Data\\Sound\\mRainnerAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_RAINNERDIE, L"Data\\Sound\\mRainnerDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 171, -1, 172, 172, 173); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 171, -1, 172, 172, 173); break; case MONSTER_MODEL_PHANTOM_KNIGHT: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; LoadWaveFile(SOUND_MONSTER_PHANTOM1, L"Data\\Sound\\mPhantom1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_PHANTOMATTACK1, L"Data\\Sound\\mPhantomAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_PHANTOMDIE, L"Data\\Sound\\mPhantomDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 168, 168, 169, 169, 170); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 168, 168, 169, 169, 170); break; case MONSTER_MODEL_DRAKAN: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; LoadWaveFile(SOUND_MONSTER_DRAKAN1, L"Data\\Sound\\mDrakan1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DRAKANATTACK1, L"Data\\Sound\\mDrakanAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DRAKANDIE, L"Data\\Sound\\mDrakanDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 165, 165, 166, 166, 167); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 165, 165, 166, 166, 167); break; case MONSTER_MODEL_DARK_PHOENIX_SHIELD: LoadWaveFile(SOUND_MONSTER_PHOENIX1, L"Data\\Sound\\mPhoenix1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_PHOENIX1, L"Data\\Sound\\mPhoenix1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_PHOENIXATTACK1, L"Data\\Sound\\mPhoenixAttack1.wav", Channel, Enable); //LoadWaveFile(SOUND_MONSTER+186,"Data\\Sound\\mDarkPhoenixDie.wav" ,Channel,Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 183, 184, 185, 185, -1); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 183, 184, 185, 185, -1); case MONSTER_MODEL_DARK_PHOENIX: b->Actions[MONSTER01_DIE].PlaySpeed = 0.22f; //b->Actions[MONSTER01_ATTACK1].PlaySpeed = 0.01f; @@ -3557,7 +3557,7 @@ void OpenMonsterModel(EMonsterModelType Type) case MONSTER_MODEL_MAGIC_SKELETON: LoadWaveFile(SOUND_MONSTER_MAGICSKULL1, L"Data\\Sound\\mMagicSkull.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_MAGICSKULL2, L"Data\\Sound\\mMagicSkull.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 186, -1, -1, -1, 187); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 186, -1, -1, -1, 187); break; case MONSTER_MODEL_CASTLE_GATE: break; @@ -3568,30 +3568,30 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_HUNTER2, L"Data\\Sound\\mHunter2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BLACKSKULLDIE, L"Data\\Sound\\mBlackSkullDie.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BLACKSKULLATTACK, L"Data\\Sound\\mBlackSkullAttack.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 188, -1, 190, -1, 189); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 188, -1, 190, -1, 189); break; case MONSTER_MODEL_GIANT_OGRE: LoadWaveFile(SOUND_MONSTER_HUNTER2, L"Data\\Sound\\mHunter2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GHAINTORGERDIE, L"Data\\Sound\\mGhaintOrgerDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 188, -1, 190, -1, 191); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 188, -1, 190, -1, 191); break; case MONSTER_MODEL_RED_SKELETON_KNIGHT: LoadWaveFile(SOUND_MONSTER_REDSKULL, L"Data\\Sound\\mRedSkull.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_REDSKULLDIE, L"Data\\Sound\\mRedSkullDie.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_REDSKULLATTACK, L"Data\\Sound\\mRedSkullAttack.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 192, -1, 194, -1, 193); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 192, -1, 194, -1, 193); break; case MONSTER_MODEL_DEATH_ANGEL: LoadWaveFile(SOUND_MONSTER_DANGELIDLE, L"Data\\Sound\\mDAngelIdle.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DANGELATTACK, L"Data\\Sound\\mDAngelAttack.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_DANGELDEATH, L"Data\\Sound\\mDAngelDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 195, 195, 196, 196, 197); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 195, 195, 196, 196, 197); break; case MONSTER_MODEL_ILLUSION_OF_KUNDUN: LoadWaveFile(SOUND_MONSTER_OCDOORDIS, L"Data\\Sound\\mKundunIdle.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BOWMERCATTACK, L"Data\\Sound\\mKundunAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BOWMERCDEATH, L"Data\\Sound\\mKundunAttack2.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 232, 232, 233, 234, -1); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 232, 232, 233, 234, -1); break; case MONSTER_MODEL_BLOOD_SOLDIER: LoadWaveFile(SOUND_MONSTER_BSOLDIERIDLE1, L"Data\\Sound\\mBSoldierIdle1.wav", Channel, Enable); @@ -3599,14 +3599,14 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_BSOLDIERATTACK1, L"Data\\Sound\\mBSoldierAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BSOLDIERATTACK2, L"Data\\Sound\\mBSoldierAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BSOLDIERDEATH, L"Data\\Sound\\mBSoldierDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 198, 199, 200, 201, 202); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 198, 199, 200, 201, 202); break; case MONSTER_MODEL_AEGIS: LoadWaveFile(SOUND_MONSTER_ESISIDLE, L"Data\\Sound\\mEsisIdle.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ESISATTACK1, L"Data\\Sound\\mEsisAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ESISATTACK2, L"Data\\Sound\\mEsisAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_ESISDEATH, L"Data\\Sound\\mEsisDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 203, 203, 204, 205, 206); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 203, 203, 204, 205, 206); break; case MONSTER_MODEL_DEATH_CENTURION: LoadWaveFile(SOUND_MONSTER_DSIDLE1, L"Data\\Sound\\mDsIdle1.wav", Channel, Enable); @@ -3619,7 +3619,7 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_LSATTACK1, L"Data\\Sound\\mLsAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LSATTACK2, L"Data\\Sound\\mLsAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LSDEATH, L"Data\\Sound\\mLsDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216); break; case MONSTER_MODEL_NECRON: LoadWaveFile(SOUND_MONSTER_NECRONIDLE1, L"Data\\Sound\\mNecronIdle1.wav", Channel, Enable); @@ -3627,7 +3627,7 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_NECRONATTACK1, L"Data\\Sound\\mNecronAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_NECRONATTACK2, L"Data\\Sound\\mNecronAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_NECRONDEATH, L"Data\\Sound\\mNecronDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 217, 218, 219, 220, 221); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 217, 218, 219, 220, 221); break; case MONSTER_MODEL_SHRIKER: LoadWaveFile(SOUND_MONSTER_SVIDLE1, L"Data\\Sound\\mSvIdle1.wav", Channel, Enable); @@ -3640,14 +3640,14 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_LVATTACK1, L"Data\\Sound\\mLvAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LVATTACK2, L"Data\\Sound\\mLvAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_LVDEATH, L"Data\\Sound\\mLvDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231); break; case MONSTER_MODEL_CASTLE_GATE1: LoadWaveFile(SOUND_MONSTER_OCDOORDIS, L"Data\\Sound\\BattleCastle\\oCDoorDis.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, -1, -1, 232); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, -1, -1, 232); break; case MONSTER_MODEL_LIFE_STONE: - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, -1, -1, -1); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, -1, -1, -1); b->Actions[MONSTER01_STOP1].PlaySpeed = 0.05f; b->Actions[MONSTER01_STOP2].PlaySpeed = 0.05f; b->Actions[MONSTER01_WALK].PlaySpeed = 0.1f; @@ -3655,12 +3655,12 @@ void OpenMonsterModel(EMonsterModelType Type) case MONSTER_MODEL_BATTLE_GUARD1: LoadWaveFile(SOUND_MONSTER_BOWMERCATTACK, L"Data\\Sound\\BattleCastle\\mBowMercAttack.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_BOWMERCDEATH, L"Data\\Sound\\BattleCastle\\mBowMercDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 233, 233, 234); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 233, 233, 234); break; case MONSTER_MODEL_BATTLE_GUARD2: LoadWaveFile(SOUND_MONSTER_SPEARMERCATTACK, L"Data\\Sound\\BattleCastle\\mSpearMercAttack.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_SPEARMERCDEATH, L"Data\\Sound\\BattleCastle\\mSpearMercDeath.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, -1, -1, 235, 235, 236); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, -1, -1, 235, 235, 236); break; case MONSTER_MODEL_CANON_TOWER: break; @@ -3793,7 +3793,7 @@ void OpenMonsterModel(EMonsterModelType Type) LoadWaveFile(SOUND_MONSTER_GOBLINATTACK1, L"Data\\Sound\\mGoblinAttack1.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOBLINATTACK2, L"Data\\Sound\\mGoblinAttack2.wav", Channel, Enable); LoadWaveFile(SOUND_MONSTER_GOBLINDIE, L"Data\\Sound\\mGoblinDie.wav", Channel, Enable); - SetMonsterSound(MODEL_MONSTER01 + Type, 72, 73, 74, 75, 76); + SetMonsterSound(static_cast(MODEL_MONSTER01) + Type, 72, 73, 74, 75, 76); break; case MONSTER_MODEL_ZOMBIE_FIGHTER: { @@ -4880,7 +4880,7 @@ void OpenCharacterSceneData() Models[MODEL_FACE + i].Actions[0].PlaySpeed = 0.3f; Models[MODEL_FACE + i].Actions[1].PlaySpeed = 0.3f; } - Models[MODEL_FACE + CLASS_SUMMONER].Actions[0].PlaySpeed = 0.25f; + Models[static_cast(MODEL_FACE) + CLASS_SUMMONER].Actions[0].PlaySpeed = 0.25f; } void ReleaseCharacterSceneData() diff --git a/src/source/_struct.h b/src/source/_struct.h index cf7e6ec99..ee3be480d 100644 --- a/src/source/_struct.h +++ b/src/source/_struct.h @@ -695,4 +695,4 @@ struct DirectionMonster }; //cdirection end -#endif ___STRUCT_H__ +#endif // ___STRUCT_H__ diff --git a/src/source/stdafx.h b/src/source/stdafx.h index 97da3bf92..7779a9b04 100644 --- a/src/source/stdafx.h +++ b/src/source/stdafx.h @@ -26,7 +26,9 @@ #pragma warning( disable : 28159 ) #pragma warning( disable : 26812 ) +#ifndef NOMINMAX #define NOMINMAX +#endif // Exclude rarely-used stuff from Windows headers #define WIN32_LEAN_AND_MEAN