diff options
44 files changed, 101 insertions, 124 deletions
diff --git a/src/server/bnetserver/Packets/BitStream.h b/src/server/bnetserver/Packets/BitStream.h index 264faf27a42..f780a4dd867 100644 --- a/src/server/bnetserver/Packets/BitStream.h +++ b/src/server/bnetserver/Packets/BitStream.h @@ -64,7 +64,7 @@ namespace Battlenet _buffer.resize(length, 0); } - BitStream(MessageBuffer&& buffer) : _writePos(buffer.GetActiveSize() * 8), _readPos(0), _buffer(buffer.Move()) + BitStream(MessageBuffer&& buffer) : _writePos(uint32(buffer.GetActiveSize()) << 3), _readPos(0), _buffer(buffer.Move()) { } @@ -147,7 +147,7 @@ namespace Battlenet void WriteString(std::string const& str, uint32 bitCount, int32 baseLength = 0) { Write(str.length() + baseLength, bitCount); - WriteBytes(str.c_str(), str.length()); + WriteBytes(str.c_str(), uint32(str.length())); } template<typename T> diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index 3a09772c41f..d431b7a0605 100644 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -91,7 +91,7 @@ class BIH buildData dat; dat.maxPrims = leafSize; - dat.numPrims = primitives.size(); + dat.numPrims = uint32(primitives.size()); dat.indices = new uint32[dat.numPrims]; dat.primBound = new G3D::AABox[dat.numPrims]; getBounds(primitives[0], bounds); @@ -115,7 +115,7 @@ class BIH delete[] dat.primBound; delete[] dat.indices; } - uint32 primCount() const { return objects.size(); } + uint32 primCount() const { return uint32(objects.size()); } template<typename RayCallback> void intersectRay(const G3D::Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp index 170350d4de4..8c549017f12 100644 --- a/src/server/collision/Management/MMapManager.cpp +++ b/src/server/collision/Management/MMapManager.cpp @@ -39,7 +39,7 @@ namespace MMAP return true; // load and init dtNavMesh - read parameters from file - uint32 pathLen = sWorld->GetDataPath().length() + strlen("mmaps/%03i.mmap")+1; + uint32 pathLen = uint32(sWorld->GetDataPath().length() + strlen("mmaps/%03i.mmap") + 1); char *fileName = new char[pathLen]; snprintf(fileName, pathLen, (sWorld->GetDataPath()+"mmaps/%03i.mmap").c_str(), mapId); @@ -52,7 +52,7 @@ namespace MMAP } dtNavMeshParams params; - int count = fread(¶ms, sizeof(dtNavMeshParams), 1, file); + uint32 count = uint32(fread(¶ms, sizeof(dtNavMeshParams), 1, file)); fclose(file); if (count != 1) { @@ -104,7 +104,7 @@ namespace MMAP return false; // load this tile :: mmaps/MMMXXYY.mmtile - uint32 pathLen = sWorld->GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile")+1; + uint32 pathLen = uint32(sWorld->GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile") + 1); char *fileName = new char[pathLen]; snprintf(fileName, pathLen, (sWorld->GetDataPath()+"mmaps/%03i%02i%02i.mmtile").c_str(), mapId, x, y); @@ -159,13 +159,9 @@ namespace MMAP TC_LOG_INFO("maps", "MMAP:loadMap: Loaded mmtile %03i[%02i, %02i] into %03i[%02i, %02i]", mapId, x, y, mapId, header->x, header->y); return true; } - else - { - TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); - dtFree(data); - return false; - } + TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); + dtFree(data); return false; } diff --git a/src/server/collision/Management/MMapManager.h b/src/server/collision/Management/MMapManager.h index ac01a3c5693..2169d82bb3e 100644 --- a/src/server/collision/Management/MMapManager.h +++ b/src/server/collision/Management/MMapManager.h @@ -73,7 +73,7 @@ namespace MMAP dtNavMesh const* GetNavMesh(uint32 mapId); uint32 getLoadedTilesCount() const { return loadedTiles; } - uint32 getLoadedMapsCount() const { return loadedMMaps.size(); } + uint32 getLoadedMapsCount() const { return uint32(loadedMMaps.size()); } private: bool loadMapData(uint32 mapId); uint32 packTileID(int32 x, int32 y); diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 08bd5c3d3a1..e477d1fd43d 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -79,7 +79,7 @@ namespace VMAP bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm); void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm); bool isTiled() const { return iIsTiled; } - uint32 numLoadedTiles() const { return iLoadedTiles.size(); } + uint32 numLoadedTiles() const { return uint32(iLoadedTiles.size()); } void getModelInstances(ModelInstance* &models, uint32 &count); private: diff --git a/src/server/collision/RegularGrid.h b/src/server/collision/RegularGrid.h index 6a2a07968ad..a582f3c081c 100644 --- a/src/server/collision/RegularGrid.h +++ b/src/server/collision/RegularGrid.h @@ -71,7 +71,7 @@ public: } bool contains(const T& value) const { return memberTable.containsKey(&value); } - int size() const { return memberTable.size(); } + int size() const { return uint32(memberTable.size()); } struct Cell { diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 58632f8ac10..91eb00f17c5 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -179,7 +179,7 @@ class UnitAI case SELECT_TARGET_RANDOM: { std::list<Unit*>::iterator itr = targetList.begin(); - std::advance(itr, urand(position, targetList.size() - 1)); + std::advance(itr, urand(position, uint32(targetList.size() - 1))); return *itr; } default: diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 8efde6b180a..145c74faf9f 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -214,7 +214,7 @@ class SmartAI : public CreatureAI uint32 mWPPauseTimer; WayPoint* mLastWP; Position mLastOOCPos;//set on enter combat - uint32 GetWPCount() { return mWayPoints ? mWayPoints->size() : 0; } + uint32 GetWPCount() { return mWayPoints ? uint32(mWayPoints->size()) : 0; } bool mCanRepeatPath; bool mRun; bool mCanAutoAttack; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index ecfd0587f01..4d73b1c3894 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -105,7 +105,7 @@ class AuctionHouseObject typedef std::map<uint32, AuctionEntry*> AuctionEntryMap; - uint32 Getcount() const { return AuctionsMap.size(); } + uint32 Getcount() const { return uint32(AuctionsMap.size()); } AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();} AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();} diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index cd4b5e3889f..e5692c3eb02 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -312,12 +312,12 @@ class Battleground typedef std::map<ObjectGuid, BattlegroundPlayer> BattlegroundPlayerMap; BattlegroundPlayerMap const& GetPlayers() const { return m_Players; } - uint32 GetPlayersSize() const { return m_Players.size(); } + uint32 GetPlayersSize() const { return uint32(m_Players.size()); } typedef std::map<ObjectGuid, BattlegroundScore*> BattlegroundScoreMap; - uint32 GetPlayerScoresSize() const { return PlayerScores.size(); } + uint32 GetPlayerScoresSize() const { return uint32(PlayerScores.size()); } - uint32 GetReviveQueueSize() const { return m_ReviveQueue.size(); } + uint32 GetReviveQueueSize() const { return uint32(m_ReviveQueue.size()); } void AddPlayerToResurrectQueue(ObjectGuid npc_guid, ObjectGuid player_guid); void RemovePlayerFromResurrectQueue(ObjectGuid player_guid); diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 9ad85767ff2..2cfe0797bce 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -174,7 +174,7 @@ class Channel std::string const& GetPassword() const { return _password; } void SetPassword(std::string const& npassword) { _password = npassword; } void SetAnnounce(bool nannounce) { _announce = nannounce; } - uint32 GetNumPlayers() const { return _playersStore.size(); } + uint32 GetNumPlayers() const { return uint32(_playersStore.size()); } uint8 GetFlags() const { return _flags; } bool HasFlag(uint8 flag) const { return (_flags & flag) != 0; } diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 0a97e431fdc..7002b987065 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -338,7 +338,7 @@ enum AreaFlags AREA_FLAG_UNK9 = 0x40000000 }; -enum Difficulty +enum Difficulty : uint8 { DIFFICULTY_NONE = 0, DIFFICULTY_NORMAL = 1, diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 4701f29c231..5e7c4e368a2 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -272,15 +272,15 @@ struct LFGDungeonData requiredItemLevel(0) { } LFGDungeonData(LFGDungeonEntry const* dbc): id(dbc->ID), name(dbc->Name_lang), map(dbc->MapID), - type(dbc->Type), expansion(dbc->Expansion), group(dbc->GroupID), - minlevel(dbc->MinLevel), maxlevel(dbc->MaxLevel), difficulty(Difficulty(dbc->DifficultyID)), + type(uint8(dbc->Type)), expansion(uint8(dbc->Expansion)), group(uint8(dbc->GroupID)), + minlevel(uint8(dbc->MinLevel)), maxlevel(uint8(dbc->MaxLevel)), difficulty(Difficulty(dbc->DifficultyID)), seasonal((dbc->Flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f), requiredItemLevel(0) { } uint32 id; std::string name; - uint16 map; + uint32 map; uint8 type; uint8 expansion; uint8 group; diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 43de647c00a..3fd06e41458 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -398,7 +398,7 @@ struct VendorItemData return m_items[slot]; } bool Empty() const { return m_items.empty(); } - uint32 GetItemCount() const { return m_items.size(); } + uint32 GetItemCount() const { return uint32(m_items.size()); } void AddItem(uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, uint8 type) { m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost, type)); diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index b71fe307738..cc0da5ffb36 100644 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -176,15 +176,8 @@ class GossipMenu void AddGossipMenuItemData(uint32 menuItemId, uint32 gossipActionMenuId, uint32 gossipActionPoi); - uint32 GetMenuItemCount() const - { - return _menuItems.size(); - } - - bool Empty() const - { - return _menuItems.empty(); - } + uint32 GetMenuItemCount() const { return uint32(_menuItems.size()); } + bool Empty() const { return _menuItems.empty(); } GossipMenuItem const* GetItem(uint32 id) const { @@ -231,23 +224,10 @@ class QuestMenu void AddMenuItem(uint32 QuestId, uint8 Icon); void ClearMenu(); - - uint8 GetMenuItemCount() const - { - return _questMenuItems.size(); - } - - bool Empty() const - { - return _questMenuItems.empty(); - } - + uint8 GetMenuItemCount() const{ return uint8(_questMenuItems.size()); } + bool Empty() const { return _questMenuItems.empty(); } bool HasItem(uint32 questId) const; - - QuestMenuItem const& GetItem(uint16 index) const - { - return _questMenuItems[index]; - } + QuestMenuItem const& GetItem(uint16 index) const { return _questMenuItems[index]; } private: QuestMenuItemList _questMenuItems; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index ff89e3f7cc0..d5d53df48c1 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -976,7 +976,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>, public Map void AddUse() { ++m_usetimes; } uint32 GetUseCount() const { return m_usetimes; } - uint32 GetUniqueUseCount() const { return m_unique_users.size(); } + uint32 GetUniqueUseCount() const { return uint32(m_unique_users.size()); } void SaveRespawnTime() override; diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index a2caa09f8fd..8514643cfad 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -157,7 +157,7 @@ enum SellResult }; // -1 from client enchantment slot number -enum EnchantmentSlot +enum EnchantmentSlot : uint16 { PERM_ENCHANTMENT_SLOT = 0, TEMP_ENCHANTMENT_SLOT = 1, diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index 50a594c36e7..98c3c428b6e 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -24,7 +24,7 @@ #include "Opcodes.h" #include "World.h" -UpdateData::UpdateData(uint16 map) : m_map(map), m_blockCount(0) { } +UpdateData::UpdateData(uint32 map) : m_map(map), m_blockCount(0) { } void UpdateData::AddOutOfRangeGUID(GuidSet& guids) { diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index 3ef2816c4ec..335eb60c4b7 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -59,7 +59,7 @@ enum OBJECT_UPDATE_FLAGS class UpdateData { public: - UpdateData(uint16 map); + UpdateData(uint32 map); UpdateData(UpdateData&& right) : m_map(right.m_map), m_blockCount(right.m_blockCount), m_outOfRangeGUIDs(std::move(right.m_outOfRangeGUIDs)), m_data(std::move(right.m_data)) @@ -76,7 +76,7 @@ class UpdateData GuidSet const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; } protected: - uint16 m_map; + uint32 m_map; uint32 m_blockCount; GuidSet m_outOfRangeGUIDs; ByteBuffer m_data; diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index eb8868bf175..b349b79a6bd 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -68,7 +68,7 @@ class Pet : public Guardian void setDeathState(DeathState s) override; // overwrite virtual Creature::setDeathState and Unit::setDeathState void Update(uint32 diff) override; // overwrite virtual Creature::Update and Unit::Update - uint8 GetPetAutoSpellSize() const override { return m_autospells.size(); } + uint8 GetPetAutoSpellSize() const override { return uint8(m_autospells.size()); } uint32 GetPetAutoSpellOnPos(uint8 pos) const override { if (pos >= m_autospells.size()) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index dbb1a03272f..db445786718 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -462,8 +462,8 @@ enum RuneType struct RuneInfo { - uint8 BaseRune; - uint8 CurrentRune; + RuneType BaseRune; + RuneType CurrentRune; uint32 Cooldown; AuraEffect const* ConvertAura; }; @@ -1824,7 +1824,7 @@ class Player : public Unit, public GridObject<Player> void RemoveMail(uint32 id); void AddMail(Mail* mail) { m_mail.push_front(mail);}// for call from WorldSession::SendMailTo - uint32 GetMailSize() { return m_mail.size();} + uint32 GetMailSize() { return uint32(m_mail.size()); } Mail* GetMail(uint32 id); PlayerMails const& GetMails() const { return m_mail; } @@ -1885,7 +1885,7 @@ class Player : public Unit, public GridObject<Player> // Talents uint32 GetTalentResetCost() const { return _talentMgr->ResetTalentsCost; } void SetTalentResetCost(uint32 cost) { _talentMgr->ResetTalentsCost = cost; } - uint32 GetTalentResetTime() const { return _talentMgr->ResetTalentsTime; } + time_t GetTalentResetTime() const { return _talentMgr->ResetTalentsTime; } void SetTalentResetTime(time_t time_) { _talentMgr->ResetTalentsTime = time_; } uint32 GetSpecId(uint8 group) const { return _talentMgr->GroupInfo[group].SpecId; } void SetSpecId(uint8 group, uint32 tree) { _talentMgr->GroupInfo[group].SpecId = tree; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7c3dfed4e2a..ff17d843f08 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -490,11 +490,11 @@ void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, if (combat_reach < 0.1f) // sometimes bugged for players combat_reach = DEFAULT_COMBAT_REACH; - uint32 attacker_number = getAttackers().size(); + uint32 attacker_number = uint32(getAttackers().size()); if (attacker_number > 0) --attacker_number; - GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin) * (float)rand_norm() - , GetAngle(obj) + (attacker_number ? (static_cast<float>(M_PI/2) - static_cast<float>(M_PI) * (float)rand_norm()) * float(attacker_number) / combat_reach * 0.3f : 0)); + GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin) * (float)rand_norm(), + GetAngle(obj) + (attacker_number ? (static_cast<float>(M_PI/2) - static_cast<float>(M_PI) * (float)rand_norm()) * float(attacker_number) / combat_reach * 0.3f : 0)); } AuraApplication * Unit::GetVisibleAura(uint8 slot) const @@ -1492,7 +1492,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* victim, const uint32 damage, SpellInfo if (tmpvalue > 0.75f) tmpvalue = 0.75f; - return std::max<uint32>(damage * (1.0f - tmpvalue), 1); + return std::max<uint32>(uint32(damage * (1.0f - tmpvalue)), 1); } uint32 Unit::CalcSpellResistance(Unit* victim, SpellSchoolMask schoolMask, SpellInfo const* spellInfo) const diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 3f9570b548f..595e2839264 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -293,7 +293,7 @@ enum ShapeshiftForm }; // low byte (0 from 0..3) of UNIT_FIELD_BYTES_2 -enum SheathState +enum SheathState : uint8 { SHEATH_STATE_UNARMED = 0, // non prepared weapon SHEATH_STATE_MELEE = 1, // prepared melee weapon @@ -618,7 +618,7 @@ enum UnitMoveType extern float baseMoveSpeed[MAX_MOVE_TYPE]; extern float playerBaseMoveSpeed[MAX_MOVE_TYPE]; -enum WeaponAttackType +enum WeaponAttackType : uint16 { BASE_ATTACK = 0, OFF_ATTACK = 1, @@ -1441,7 +1441,7 @@ class Unit : public WorldObject int32 ModifyPowerPct(Powers power, float pct, bool apply = true); uint32 GetAttackTime(WeaponAttackType att) const; - void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att, val*m_modAttackSpeedPct[att]); } + void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME + att, val*m_modAttackSpeedPct[att]); } void ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply); void ApplyCastTimePercentMod(float val, bool apply); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index df7a3a65dd8..2523f316cec 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4970,14 +4970,14 @@ void ObjectMgr::LoadInstanceEncounters() { if (GetMapDifficultyData(dungeonEncounter->MapID, Difficulty(i))) { - DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->MapID, i)]; + DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR64(dungeonEncounter->MapID, i)]; encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); } } } else { - DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->MapID, dungeonEncounter->DifficultyID)]; + DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR64(dungeonEncounter->MapID, dungeonEncounter->DifficultyID)]; encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); } @@ -5843,7 +5843,7 @@ void ObjectMgr::LoadAccessRequirements() uint32 mapid = fields[0].GetUInt32(); uint8 difficulty = fields[1].GetUInt8(); - uint32 requirement_ID = MAKE_PAIR32(mapid, difficulty); + uint32 requirement_ID = MAKE_PAIR64(mapid, difficulty); AccessRequirement* ar = new AccessRequirement(); ar->levelMin = fields[2].GetUInt8(); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 6bc0014162d..e9ec98f3e98 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -670,7 +670,7 @@ struct DungeonEncounter }; typedef std::list<DungeonEncounter const*> DungeonEncounterList; -typedef std::unordered_map<uint32, DungeonEncounterList> DungeonEncounterContainer; +typedef std::unordered_map<uint64, DungeonEncounterList> DungeonEncounterContainer; class PlayerDumpReader; @@ -697,7 +697,7 @@ class ObjectMgr typedef std::unordered_map<uint32, uint32> AreaTriggerScriptContainer; - typedef std::unordered_map<uint32, AccessRequirement*> AccessRequirementContainer; + typedef std::unordered_map<uint64, AccessRequirement*> AccessRequirementContainer; typedef std::unordered_map<uint32, RepRewardRate > RepRewardRateContainer; typedef std::unordered_map<uint32, ReputationOnKillEntry> RepOnKillContainer; @@ -809,7 +809,7 @@ class ObjectMgr AccessRequirement const* GetAccessRequirement(uint32 mapid, Difficulty difficulty) const { - AccessRequirementContainer::const_iterator itr = _accessRequirementStore.find(MAKE_PAIR32(mapid, difficulty)); + AccessRequirementContainer::const_iterator itr = _accessRequirementStore.find(MAKE_PAIR64(mapid, difficulty)); if (itr != _accessRequirementStore.end()) return itr->second; return NULL; @@ -869,7 +869,7 @@ class ObjectMgr DungeonEncounterList const* GetDungeonEncounterList(uint32 mapId, Difficulty difficulty) { - std::unordered_map<uint32, DungeonEncounterList>::const_iterator itr = _dungeonEncounterStore.find(MAKE_PAIR32(mapId, difficulty)); + DungeonEncounterContainer::const_iterator itr = _dungeonEncounterStore.find(MAKE_PAIR64(mapId, difficulty)); if (itr != _dungeonEncounterStore.end()) return &itr->second; return NULL; @@ -1039,7 +1039,7 @@ class ObjectMgr ExclusiveQuestGroups mExclusiveQuestGroups; - MailLevelReward const* GetMailLevelReward(uint32 level, uint32 raceMask) + MailLevelReward const* GetMailLevelReward(uint8 level, uint32 raceMask) { MailLevelRewardContainer::const_iterator map_itr = _mailLevelRewardStore.find(level); if (map_itr == _mailLevelRewardStore.end()) diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index 69b245e4326..7d3dc799a7c 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -104,7 +104,7 @@ class Grid template<class T> uint32 GetWorldObjectCountInGrid() const { - return i_objects.template Count<T>(); + return uint32(i_objects.template Count<T>()); } /** Inserts a container type object into the grid. diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index ab256704ad5..274676036a3 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -240,7 +240,7 @@ class Group MemberSlotList const& GetMemberSlots() const { return m_memberSlots; } GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); } GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); } - uint32 GetMembersCount() const { return m_memberSlots.size(); } + uint32 GetMembersCount() const { return uint32(m_memberSlots.size()); } GroupType GetGroupType() const { return m_groupType; } uint8 GetMemberGroup(ObjectGuid guid) const; diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 55b740eb8ed..22032f05ee3 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -765,7 +765,7 @@ public: std::string const& GetName() const { return m_name; } std::string const& GetMOTD() const { return m_motd; } std::string const& GetInfo() const { return m_info; } - uint32 GetMemberCount() const { return m_members.size(); } + uint32 GetMemberCount() const { return uint32(m_members.size()); } time_t GetCreatedDate() const { return m_createdDate; } uint64 GetBankMoney() const { return m_bankMoney; } @@ -856,7 +856,7 @@ public: void DeleteMember(ObjectGuid guid, bool isDisbanding = false, bool isKicked = false, bool canDeleteGuild = false); bool ChangeMemberRank(ObjectGuid guid, uint8 newRank); bool IsMember(ObjectGuid guid) const; - uint32 GetMembersCount() { return m_members.size(); } + uint32 GetMembersCount() { return uint32(m_members.size()); } // Bank void SwapItems(Player* player, uint8 tabId, uint8 slotId, uint8 destTabId, uint8 destSlotId, uint32 splitedAmount); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 4a4eef58b34..eef42a23c06 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -2336,8 +2336,9 @@ void WorldSession::HandleUndeleteCooldownStatusCallback(PreparedQueryResult resu if (result) { uint32 lastUndelete = result->Fetch()[0].GetUInt32(); - if (lastUndelete) - cooldown = uint32(std::max<int32>(0, int32(lastUndelete) + maxCooldown - time(nullptr))); + uint32 now = uint32(time(nullptr)); + if (lastUndelete + maxCooldown > now) + cooldown = std::max<uint32>(0, lastUndelete + maxCooldown - now); } SendUndeleteCooldownStatusResponse(cooldown, maxCooldown); diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 1b7f5502049..5c5722dbaa9 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -55,8 +55,8 @@ class InstanceSave or when the instance is reset */ ~InstanceSave(); - uint8 GetPlayerCount() const { return m_playerList.size(); } - uint8 GetGroupCount() const { return m_groupList.size(); } + uint32 GetPlayerCount() const { return uint32(m_playerList.size()); } + uint32 GetGroupCount() const { return uint32(m_groupList.size()); } /* A map corresponding to the InstanceId/MapId does not always exist. InstanceSave objects may be created on player logon but the maps are @@ -145,7 +145,7 @@ class InstanceSave std::mutex _playerListLock; }; -typedef std::unordered_map<uint32 /*PAIR32(map, difficulty)*/, time_t /*resetTime*/> ResetTimeByMapDifficultyMap; +typedef std::unordered_map<uint64 /*PAIR64(map, difficulty)*/, time_t /*resetTime*/> ResetTimeByMapDifficultyMap; class InstanceSaveManager { @@ -172,11 +172,11 @@ class InstanceSaveManager { uint8 type; Difficulty difficulty:8; - uint16 mapid; - uint16 instanceId; + uint32 mapid; + uint32 instanceId; InstResetEvent() : type(0), difficulty(DIFFICULTY_NORMAL), mapid(0), instanceId(0) { } - InstResetEvent(uint8 t, uint32 _mapid, Difficulty d, uint16 _instanceid) + InstResetEvent(uint8 t, uint32 _mapid, Difficulty d, uint32 _instanceid) : type(t), difficulty(d), mapid(_mapid), instanceId(_instanceid) { } bool operator == (const InstResetEvent& e) const { return e.instanceId == instanceId; } }; @@ -187,20 +187,20 @@ class InstanceSaveManager void LoadResetTimes(); time_t GetResetTimeFor(uint32 mapid, Difficulty d) const { - ResetTimeByMapDifficultyMap::const_iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid, d)); + ResetTimeByMapDifficultyMap::const_iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR64(mapid, d)); return itr != m_resetTimeByMapDifficulty.end() ? itr->second : 0; } // Use this on startup when initializing reset times void InitializeResetTimeFor(uint32 mapid, Difficulty d, time_t t) { - m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid, d)] = t; + m_resetTimeByMapDifficulty[MAKE_PAIR64(mapid, d)] = t; } // Use this only when updating existing reset times void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t) { - ResetTimeByMapDifficultyMap::iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid, d)); + ResetTimeByMapDifficultyMap::iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR64(mapid, d)); ASSERT(itr != m_resetTimeByMapDifficulty.end()); itr->second = t; } @@ -222,7 +222,7 @@ class InstanceSaveManager InstanceSave* GetInstanceSave(uint32 InstanceId); /* statistics */ - uint32 GetNumInstanceSaves() { return m_instanceSaveById.size(); } + uint32 GetNumInstanceSaves() { return uint32(m_instanceSaveById.size()); } uint32 GetNumBoundPlayersTotal(); uint32 GetNumBoundGroupsTotal(); diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index daedb0d9ac8..acd511a402b 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -248,7 +248,7 @@ class InstanceScript : public ZoneScript // ReCheck PhaseTemplate related conditions void UpdatePhasing(); - uint32 GetEncounterCount() const { return bosses.size(); } + uint32 GetEncounterCount() const { return uint32(bosses.size()); } protected: void SetHeaders(std::string const& dataHeaders); diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 53413dc55f3..240a07b7d25 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -152,8 +152,8 @@ uint32 LootStore::LoadLootTable() bool needsquest = fields[4].GetBool(); uint16 lootmode = fields[5].GetUInt16(); uint8 groupid = fields[6].GetUInt8(); - int32 mincount = fields[7].GetUInt8(); - int32 maxcount = fields[8].GetUInt8(); + uint8 mincount = fields[7].GetUInt8(); + uint8 maxcount = fields[8].GetUInt8(); if (maxcount > std::numeric_limits<uint8>::max()) { diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index a14bcb50107..534ed1a173c 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -144,7 +144,7 @@ struct LootStoreItem // Constructor // displayid is filled in IsValid() which must be called after - LootStoreItem(uint32 _itemid, uint32 _reference, float _chance, bool _needs_quest, uint16 _lootmode, uint8 _groupid, int32 _mincount, uint8 _maxcount) + LootStoreItem(uint32 _itemid, uint32 _reference, float _chance, bool _needs_quest, uint16 _lootmode, uint8 _groupid, uint8 _mincount, uint8 _maxcount) : itemid(_itemid), reference(_reference), chance(_chance), lootmode(_lootmode), needs_quest(_needs_quest), groupid(_groupid), mincount(_mincount), maxcount(_maxcount) { } diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 9396bbc110f..ca1f22b3faa 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -132,7 +132,7 @@ namespace Trinity if (nLevelDiff > 4) nLevelDiff = 4; - baseGain = round(BaseExpPlayer->Data * (1 + 0.05f * nLevelDiff)); + baseGain = uint32(round(BaseExpPlayer->Data * (1 + 0.05f * nLevelDiff))); } else { @@ -140,7 +140,7 @@ namespace Trinity if (mob_level > gray_level) { uint8 ZD = GetZeroDifference(pl_level); - baseGain = round(BaseExpMob->Data * ((1 - ((pl_level - mob_level) / float(ZD))) * (CoefMob->Data / CoefPlayer->Data))); + baseGain = uint32(round(BaseExpMob->Data * ((1 - ((pl_level - mob_level) / float(ZD))) * (CoefMob->Data / CoefPlayer->Data)))); } else baseGain = 0; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 73d4c295928..851cbbc27a8 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -232,7 +232,7 @@ enum MoneyConstants GOLD = SILVER*100 }; -enum Stats +enum Stats : uint16 { STAT_STRENGTH = 0, STAT_AGILITY = 1, @@ -269,7 +269,7 @@ enum Powers // (6.0) #define MAX_POWERS_PER_CLASS 5 -enum SpellSchools +enum SpellSchools : uint16 { SPELL_SCHOOL_NORMAL = 0, SPELL_SCHOOL_HOLY = 1, @@ -2029,7 +2029,7 @@ enum SpellPreventionType SPELL_PREVENTION_TYPE_UNK = 3 // Only a few spells have this, but most of the should be interruptable. }; -enum GameobjectTypes // (6.0.3.19103) +enum GameobjectTypes : uint8 // (6.0.3.19103) { GAMEOBJECT_TYPE_DOOR = 0, GAMEOBJECT_TYPE_BUTTON = 1, @@ -4530,7 +4530,7 @@ enum BanReturn BAN_NOTFOUND }; -enum BattlegroundTeamId +enum BattlegroundTeamId : uint8 { BG_TEAM_HORDE = 0, // Battleground: Horde, Arena: Green BG_TEAM_ALLIANCE = 1, // Battleground: Alliance, Arena: Gold diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 6e8a5a0281d..7b4f5ab1e54 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -108,9 +108,9 @@ public: EvaluationMode mode() const { return (EvaluationMode)m_mode;} bool isCyclic() const { return cyclic;} - const ControlArray& getPoints() const { return points;} - index_type getPointCount() const { return points.size();} - const Vector3& getPoint(index_type i) const { return points[i];} + const ControlArray& getPoints() const { return points; } + index_type getPointCount() const { return index_type(points.size()); } + const Vector3& getPoint(index_type i) const { return points[i]; } /** Initializes spline. Don't call other methods while spline not initialized. */ void init_spline(const Vector3 * controls, index_type count, EvaluationMode m); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index b3e4a2314db..84275b95d81 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1131,9 +1131,9 @@ class ScriptMgr public: /* Scheduled scripts */ - uint32 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; } - uint32 DecreaseScheduledScriptCount() { return --_scheduledScripts; } - uint32 DecreaseScheduledScriptCount(size_t count) { return _scheduledScripts -= count; } + uint64 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; } + uint64 DecreaseScheduledScriptCount() { return --_scheduledScripts; } + uint64 DecreaseScheduledScriptCount(uint64 count) { return _scheduledScripts -= count; } bool IsScriptScheduled() const { return _scheduledScripts > 0; } private: @@ -1141,7 +1141,7 @@ class ScriptMgr uint32 _scriptCount; //atomic op counter for active scripts amount - std::atomic_long _scheduledScripts; + std::atomic<uint64> _scheduledScripts; }; #endif diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 9f09242b37c..0af38131740 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -673,7 +673,7 @@ void Aura::_ApplyEffectForTargets(uint8 effIndex) UnitList targetList; for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter) { - if ((appIter->second->GetEffectsToApply() & (1<<effIndex)) && !appIter->second->HasEffect(effIndex)) + if ((appIter->second->GetEffectsToApply() & (1 << effIndex)) && !appIter->second->HasEffect(effIndex)) targetList.push_back(appIter->second->GetTarget()); } diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index d19131cb33d..9aafb508f86 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -684,7 +684,7 @@ class SpellMgr ASSERT(spellInfo); return spellInfo; } - uint32 GetSpellInfoStoreSize() const { return mSpellInfoMap.size(); } + uint32 GetSpellInfoStoreSize() const { return uint32(mSpellInfoMap.size()); } void LoadPetFamilySpellsStore(); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 120c96b2073..847ca687112 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -578,9 +578,9 @@ class World /// Get the number of current active sessions void UpdateMaxSessionCounters(); const SessionMap& GetAllSessions() const { return m_sessions; } - uint32 GetActiveAndQueuedSessionCount() const { return m_sessions.size(); } - uint32 GetActiveSessionCount() const { return m_sessions.size() - m_QueuedPlayer.size(); } - uint32 GetQueuedSessionCount() const { return m_QueuedPlayer.size(); } + uint32 GetActiveAndQueuedSessionCount() const { return uint32(m_sessions.size()); } + uint32 GetActiveSessionCount() const { return uint32(m_sessions.size() - m_QueuedPlayer.size()); } + uint32 GetQueuedSessionCount() const { return uint32(m_QueuedPlayer.size()); } /// Get the maximum number of parallel sessions on the server since last reboot uint32 GetMaxQueuedSessionCount() const { return m_maxQueuedSessionCount; } uint32 GetMaxActiveSessionCount() const { return m_maxActiveSessionCount; } diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 26b68b7281b..6e82c4fbd1a 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -317,7 +317,7 @@ public: return false; } - uint8 state = map->ToInstanceMap()->GetInstanceScript()->GetBossState(encounterId); + uint32 state = map->ToInstanceMap()->GetInstanceScript()->GetBossState(encounterId); handler->PSendSysMessage(LANG_COMMAND_INST_GET_BOSS_STATE, encounterId, state); return true; } diff --git a/src/server/shared/Containers.h b/src/server/shared/Containers.h index 58379e1fefa..5dee18cb752 100644 --- a/src/server/shared/Containers.h +++ b/src/server/shared/Containers.h @@ -31,7 +31,7 @@ namespace Trinity template<class T> void RandomResizeList(std::list<T> &list, uint32 size) { - size_t list_size = list.size(); + uint32 list_size = uint32(list.size()); while (list_size > size) { @@ -61,7 +61,7 @@ namespace Trinity template <class C> typename C::value_type const& SelectRandomContainerElement(C const& container) { typename C::const_iterator it = container.begin(); - std::advance(it, urand(0, container.size() - 1)); + std::advance(it, urand(0, uint32(container.size()) - 1)); return *it; } diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index f0ddbe91ad8..f1c6a7acbf5 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -434,7 +434,7 @@ class DatabaseWorkerPool return; char* buf = new char[str.size() * 2 + 1]; - EscapeString(buf, str.c_str(), str.size()); + EscapeString(buf, str.c_str(), uint32(str.length())); str = buf; delete[] buf; } diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 8efaf7efccb..4ac35c9feeb 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -196,16 +196,16 @@ class ByteBuffer return ((_curbitval >> (7-_bitpos)) & 1) != 0; } - template <typename T> void WriteBits(T value, size_t bits) + template <typename T> void WriteBits(T value, int32 bits) { - for (int32 i = bits-1; i >= 0; --i) + for (int32 i = bits - 1; i >= 0; --i) WriteBit((value >> i) & 1); } - uint32 ReadBits(size_t bits) + uint32 ReadBits(int32 bits) { uint32 value = 0; - for (int32 i = bits-1; i >= 0; --i) + for (int32 i = bits - 1; i >= 0; --i) if (ReadBit()) value |= (1 << (i)); |