From 3e43600c3b12b1053802072b84876c58e91e29ef Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 3 Nov 2008 18:01:31 +0300 Subject: [PATCH] Correct check for ACE_BIG_ENDIAN. Warning fixed and code cleanups. --- src/framework/Platform/Define.h | 2 +- src/game/AuctionHouse.cpp | 2 +- src/game/BattleGround.cpp | 2 +- src/game/Guild.h | 4 +-- src/game/ItemHandler.cpp | 6 ++-- src/game/ObjectMgr.h | 2 +- src/game/Player.h | 2 +- src/game/QueryHandler.cpp | 14 ++++---- src/shared/vmap/AABSPTree.h | 54 +++++++++++++++-------------- src/shared/vmap/CoordModelMapping.h | 6 ++-- src/shared/vmap/ModelContainer.h | 7 ++-- src/shared/vmap/VMapDefinitions.h | 4 +-- src/shared/vmap/VMapManager.h | 10 +++--- src/shared/vmap/VMapTools.h | 2 +- 14 files changed, 60 insertions(+), 57 deletions(-) diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 3f8cc1590..add74f347 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -30,7 +30,7 @@ #define MANGOS_BIGENDIAN 1 #if !defined(MANGOS_ENDIAN) -# if ACE_BYTE_ORDER == ACE_BIG_ENDIAN +# if defined (ACE_BIG_ENDIAN) # define MANGOS_ENDIAN MANGOS_BIGENDIAN # else //ACE_BYTE_ORDER != ACE_BIG_ENDIAN # define MANGOS_ENDIAN MANGOS_LITTLEENDIAN diff --git a/src/game/AuctionHouse.cpp b/src/game/AuctionHouse.cpp index d85bc34bb..61e1377a1 100644 --- a/src/game/AuctionHouse.cpp +++ b/src/game/AuctionHouse.cpp @@ -714,7 +714,7 @@ void WorldSession::HandleAuctionListItems( WorldPacket & recv_data ) ItemLocale const *il = objmgr.GetItemLocale(proto->ItemId); if (il) { - if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty()) + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) name = il->Name[loc_idx]; } } diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 00db60b4f..7cb417ce5 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -510,7 +510,7 @@ void BattleGround::SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count) int loc_idx = plr->GetSession()->GetSessionDbLocaleIndex(); if ( loc_idx >= 0 ) if(ItemLocale const *il = objmgr.GetItemLocale(markProto->ItemId)) - if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty()) + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) subject = il->Name[loc_idx]; // text diff --git a/src/game/Guild.h b/src/game/Guild.h index cb46e1107..68a5dc773 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -197,7 +197,7 @@ struct GuildBankEvent uint8 DestTabId; uint64 TimeStamp; - const bool isMoneyEvent() + bool isMoneyEvent() const { return LogEntry == GUILD_BANK_LOG_DEPOSIT_MONEY || LogEntry == GUILD_BANK_LOG_WITHDRAW_MONEY || @@ -356,7 +356,7 @@ class Guild void SetGuildBankTabInfo(uint8 TabId, std::string name, std::string icon); void CreateBankRightForTab(uint32 rankid, uint8 TabId); const GuildBankTab *GetBankTab(uint8 index) { if(index >= m_TabListMap.size()) return NULL; return m_TabListMap[index]; } - const uint8 GetPurchasedTabs() const { return purchased_tabs; } + uint8 GetPurchasedTabs() const { return purchased_tabs; } uint32 GetBankRights(uint32 rankId, uint8 TabId) const; bool IsMemberHaveRights(uint32 LowGuid, uint8 TabId,uint32 rights) const; bool CanMemberViewTab(uint32 LowGuid, uint8 TabId) const; diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 9396b8633..421f6ae53 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -311,9 +311,9 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data ) ItemLocale const *il = objmgr.GetItemLocale(pProto->ItemId); if (il) { - if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty()) + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) Name = il->Name[loc_idx]; - if (il->Description.size() > loc_idx && !il->Description[loc_idx].empty()) + if (il->Description.size() > size_t(loc_idx) && !il->Description[loc_idx].empty()) Description = il->Description[loc_idx]; } } @@ -977,7 +977,7 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data) ItemLocale const *il = objmgr.GetItemLocale(pProto->ItemId); if (il) { - if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty()) + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) Name = il->Name[loc_idx]; } } diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index c9b4e9bdf..6e0b178ea 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -700,7 +700,7 @@ class ObjectMgr int GetIndexForLocale(LocaleConstant loc); LocaleConstant GetLocaleForIndex(int i); // guild bank tabs - const uint32 GetGuildBankTabPrice(uint8 Index) { return Index < GUILD_BANK_MAX_TABS ? mGuildBankTabPrice[Index] : 0; } + uint32 GetGuildBankTabPrice(uint8 Index) const { return Index < GUILD_BANK_MAX_TABS ? mGuildBankTabPrice[Index] : 0; } uint16 GetConditionId(ConditionType condition, uint32 value1, uint32 value2); bool IsPlayerMeetToCondition(Player const* player, uint16 condition_id) const diff --git a/src/game/Player.h b/src/game/Player.h index ca6e50bd9..7db254863 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1296,7 +1296,7 @@ class MANGOS_DLL_SPEC Player : public Unit if(d < 0) SetMoney (GetMoney() > uint32(-d) ? GetMoney() + d : 0); else - SetMoney (GetMoney() < MAX_MONEY_AMOUNT - d ? GetMoney() + d : MAX_MONEY_AMOUNT); + SetMoney (GetMoney() < uint32(MAX_MONEY_AMOUNT - d) ? GetMoney() + d : MAX_MONEY_AMOUNT); // "At Gold Limit" if(GetMoney() >= MAX_MONEY_AMOUNT) diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index 2c912a9e7..f71cb761b 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -165,9 +165,9 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data ) CreatureLocale const *cl = objmgr.GetCreatureLocale(entry); if (cl) { - if (cl->Name.size() > loc_idx && !cl->Name[loc_idx].empty()) + if (cl->Name.size() > size_t(loc_idx) && !cl->Name[loc_idx].empty()) Name = cl->Name[loc_idx]; - if (cl->SubName.size() > loc_idx && !cl->SubName[loc_idx].empty()) + if (cl->SubName.size() > size_t(loc_idx) && !cl->SubName[loc_idx].empty()) SubName = cl->SubName[loc_idx]; } } @@ -233,9 +233,9 @@ void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data ) GameObjectLocale const *gl = objmgr.GetGameObjectLocale(entryID); if (gl) { - if (gl->Name.size() > loc_idx && !gl->Name[loc_idx].empty()) + if (gl->Name.size() > size_t(loc_idx) && !gl->Name[loc_idx].empty()) Name = gl->Name[loc_idx]; - if (gl->CastBarCaption.size() > loc_idx && !gl->CastBarCaption[loc_idx].empty()) + if (gl->CastBarCaption.size() > size_t(loc_idx) && !gl->CastBarCaption[loc_idx].empty()) CastBarCaption = gl->CastBarCaption[loc_idx]; } } @@ -345,9 +345,9 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) { for (int i=0;i<8;i++) { - if (nl->Text_0[i].size() > loc_idx && !nl->Text_0[i][loc_idx].empty()) + if (nl->Text_0[i].size() > size_t(loc_idx) && !nl->Text_0[i][loc_idx].empty()) Text_0[i]=nl->Text_0[i][loc_idx]; - if (nl->Text_1[i].size() > loc_idx && !nl->Text_1[i][loc_idx].empty()) + if (nl->Text_1[i].size() > size_t(loc_idx) && !nl->Text_1[i][loc_idx].empty()) Text_1[i]=nl->Text_1[i][loc_idx]; } } @@ -417,7 +417,7 @@ void WorldSession::HandlePageQueryOpcode( WorldPacket & recv_data ) PageTextLocale const *pl = objmgr.GetPageTextLocale(pageID); if (pl) { - if (pl->Text.size() > loc_idx && !pl->Text[loc_idx].empty()) + if (pl->Text.size() > size_t(loc_idx) && !pl->Text[loc_idx].empty()) Text = pl->Text[loc_idx]; } } diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h index a05fac9ab..7a5488eb9 100644 --- a/src/shared/vmap/AABSPTree.h +++ b/src/shared/vmap/AABSPTree.h @@ -261,7 +261,7 @@ public: /** Returns the bounds of the sub array. Used by makeNode. */ static AABox computeBounds( - const Array<_AABSPTree::Handle*>& point, + const Array<_AABSPTree::Handle*>& point, int beginIndex, int endIndex) { @@ -770,9 +770,11 @@ public: // Some of the elements in the lt or gt array might really overlap the split location. // Move them as needed. - for (int i = 0; i < lt.size(); ++i) { - const AABox& bounds = lt[i]->bounds; - if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) { + for (int i = 0; i < lt.size(); ++i) + { + const AABox& lt_bounds = lt[i]->bounds; + if ((bounds.low()[splitAxis] <= splitLocation) && (lt_bounds.high()[splitAxis] >= splitLocation)) + { node->valueArray.append(lt[i]); // Remove this element and process the new one that // is swapped in in its place. @@ -780,9 +782,11 @@ public: } } - for (int i = 0; i < gt.size(); ++i) { - const AABox& bounds = gt[i]->bounds; - if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) { + for (int i = 0; i < gt.size(); ++i) + { + const AABox& gt_bounds = gt[i]->bounds; + if ((bounds.low()[splitAxis] <= splitLocation) && (gt_bounds.high()[splitAxis] >= splitLocation)) + { node->valueArray.append(gt[i]); // Remove this element and process the new one that // is swapped in in its place. @@ -819,19 +823,20 @@ public: // Verify that all objects ended up on the correct side of the split. // (i.e., make sure that the Array partition was correct) for (int i = 0; i < lt.size(); ++i) { - const AABox& bounds = lt[i]->bounds; - debugAssert(bounds.high()[splitAxis] < splitLocation); + const AABox& lt_bounds = lt[i]->bounds; + debugAssert(lt_bounds.high()[splitAxis] < splitLocation); } for (int i = 0; i < gt.size(); ++i) { - const AABox& bounds = gt[i]->bounds; - debugAssert(bounds.low()[splitAxis] > splitLocation); + const AABox& gt_bounds = gt[i]->bounds; + debugAssert(gt_bounds.low()[splitAxis] > splitLocation); } - for (int i = 0; i < node->valueArray.size(); ++i) { - const AABox& bounds = node->valueArray[i]->bounds; - debugAssert(bounds.high()[splitAxis] >= splitLocation); - debugAssert(bounds.low()[splitAxis] <= splitLocation); + for (int i = 0; i < node->valueArray.size(); ++i) + { + const AABox& node_bounds = node->valueArray[i]->bounds; + debugAssert(node_bounds.high()[splitAxis] >= splitLocation); + debugAssert(node_bounds.low()[splitAxis] <= splitLocation); } # endif @@ -925,16 +930,17 @@ public: /** Throws out all elements of the set. */ - void clear() { + void clear() + { typedef typename Table<_internal::Indirector<_AABSPTree::Handle >, Node* >::Iterator It; // Delete all handles stored in the member table - It cur = memberTable.begin(); - It end = memberTable.end(); - while (cur != end) { - delete cur->key.handle; - cur->key.handle = NULL; - ++cur; + It tab_cur = memberTable.begin(); + It tab_end = memberTable.end(); + while (tab_cur != tab_end) { + delete tab_cur->key.handle; + tab_cur->key.handle = NULL; + ++tab_cur; } memberTable.clear(); @@ -1543,10 +1549,6 @@ public: private: friend class AABSPTree; - // Note: this is a Table iterator, we are currently defining - // Set iterator - typename Table::Iterator it; - Iterator(const typename Table::Iterator& it) : it(it) {} public: diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index f94bcb125..d96107886 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -126,8 +126,8 @@ namespace VMAP } const G3D::Array& getMaps() const { return iMapIds; } - inline bool isAlreadyProcessedSingleFile(std::string pName) { return(iProcesseSingleFiles.containsKey(pName)); } - inline void addAlreadyProcessedSingleFile(std::string pName) { iProcesseSingleFiles.set(pName,pName); } + bool isAlreadyProcessedSingleFile(std::string pName) const { return iProcesseSingleFiles.containsKey(pName); } + void addAlreadyProcessedSingleFile(std::string pName) { iProcesseSingleFiles.set(pName,pName); } inline void addWorldAreaMap(unsigned int pMapId) { @@ -136,7 +136,7 @@ namespace VMAP iWorldAreaGroups.append(pMapId); } } - inline bool isWorldAreaMap(unsigned int pMapId) { return(iWorldAreaGroups.contains(pMapId)); } + bool isWorldAreaMap(unsigned int pMapId) const { return(iWorldAreaGroups.contains(pMapId)); } void setModelNameFilterMethod(bool (*pFilterMethod)(char *pName)) { iFilterMethod = pFilterMethod; } }; diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h index edfa3581e..b1a0f1737 100644 --- a/src/shared/vmap/ModelContainer.h +++ b/src/shared/vmap/ModelContainer.h @@ -52,8 +52,9 @@ namespace VMAP SubModel *iSubModel; G3D::AABox iBox; - ModelContainer (const ModelContainer& c): BaseModel(c) {} - ModelContainer& operator=(const ModelContainer& ) {} + // not allowed copy + explicit ModelContainer (const ModelContainer&); + ModelContainer& operator=(const ModelContainer&); public: ModelContainer() : BaseModel() { iNSubModel =0; iSubModel = 0; }; @@ -65,7 +66,7 @@ namespace VMAP ~ModelContainer(void); - inline const void setSubModel(const SubModel& pSubModel, int pPos) { iSubModel[pPos] = pSubModel; } + inline void setSubModel(const SubModel& pSubModel, int pPos) { iSubModel[pPos] = pSubModel; } inline const SubModel& getSubModel(int pPos) const { return iSubModel[pPos]; } diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h index 4b02d5987..04c31a2b6 100644 --- a/src/shared/vmap/VMapDefinitions.h +++ b/src/shared/vmap/VMapDefinitions.h @@ -23,13 +23,13 @@ namespace VMAP { //===================================== - #define MAX_CAN_FALL_DISTANCE 10.0 + #define MAX_CAN_FALL_DISTANCE 10.0f const char VMAP_MAGIC[] = "VMAP_2.0"; class VMapDefinitions { public: - static const double getMaxCanFallDistance() { return(MAX_CAN_FALL_DISTANCE); } + static float getMaxCanFallDistance() { return MAX_CAN_FALL_DISTANCE; } }; //====================================== diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index 54d7a51e3..5e2c32092 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.h @@ -88,14 +88,14 @@ namespace VMAP private: float getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit); - bool isAlreadyLoaded(const std::string& pName) { return(iLoadedModelContainer.containsKey(pName)); } + bool isAlreadyLoaded(const std::string& pName) const { return(iLoadedModelContainer.containsKey(pName)); } void setLoadedMapTile(unsigned int pTileIdent) { iLoadedMapTiles.set(pTileIdent, true); } void removeLoadedMapTile(unsigned int pTileIdent) { iLoadedMapTiles.remove(pTileIdent); } - bool hasLoadedMapTiles() { return(iLoadedMapTiles.size() > 0); } - bool containsLoadedMapTile(unsigned int pTileIdent) { return(iLoadedMapTiles.containsKey(pTileIdent)); } + bool hasLoadedMapTiles() const { return iLoadedMapTiles.size() > 0; } + bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } public: ManagedModelContainer *getModelContainer(const std::string& pName) { return(iLoadedModelContainer.get(pName)); } - const bool hasDirFile(const std::string& pDirName) const { return(iLoadedDirFiles.containsKey(pDirName)); } + bool hasDirFile(const std::string& pDirName) const { return(iLoadedDirFiles.containsKey(pDirName)); } FilesInDir& getDirFiles(const std::string& pDirName) const { return(iLoadedDirFiles.get(pDirName)); } public: MapTree(const char *pBasePath); @@ -111,7 +111,7 @@ namespace VMAP void unloadMap(const std::string& dirFileName, unsigned int pMapTileIdent, bool pForce=false); void getModelContainer(G3D::Array& pArray ) { iTree->getMembers(pArray); } - const void addDirFile(const std::string& pDirName, const FilesInDir& pFilesInDir) { iLoadedDirFiles.set(pDirName, pFilesInDir); } + void addDirFile(const std::string& pDirName, const FilesInDir& pFilesInDir) { iLoadedDirFiles.set(pDirName, pFilesInDir); } size_t size() { return(iTree->size()); } }; diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h index 211940495..4122f420e 100644 --- a/src/shared/vmap/VMapTools.h +++ b/src/shared/vmap/VMapTools.h @@ -62,7 +62,7 @@ namespace VMAP { // Integer representation of a floating-point value. -#define IR(x) ((G3D::uint32&)x) +#define IR(x) (reinterpret_cast(x)) Inside = true; const G3D::Vector3& MinB = box.low();