diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 188842a4c..18c2c6a8e 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -2662,7 +2662,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu realm completed achievements.", (unsigned long)m_allCompletedAchievements.size()); + sLog.outString(">> Loaded " SIZEFMTD " realm completed achievements.", m_allCompletedAchievements.size()); } void AchievementGlobalMgr::LoadRewards() @@ -2889,5 +2889,5 @@ void AchievementGlobalMgr::LoadRewardLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size()); + sLog.outString(">> Loaded " SIZEFMTD " achievement reward locale strings", m_achievementRewardLocales.size()); } diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 5199ae36d..17a356a7c 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -553,7 +553,7 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recv_data) if (slotid > pLoot->items.size()) { - DEBUG_LOG("AutoLootItem: Player %s might be using a hack! (slot %d, size %lu)", GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size()); + DEBUG_LOG("AutoLootItem: Player %s might be using a hack! (slot %d, size " SIZEFMTD ")", GetPlayer()->GetName(), slotid, pLoot->items.size()); return; } diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index c1294c461..6c33279d3 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -174,7 +174,7 @@ void LootStore::LoadLootTable() Verify(); // Checks validity of the loot store sLog.outString(); - sLog.outString(">> Loaded %u loot definitions (%lu templates)", count, (unsigned long)m_LootTemplates.size()); + sLog.outString(">> Loaded %u loot definitions (" SIZEFMTD " templates)", count, m_LootTemplates.size()); } else { diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 6317b4ca5..161a91f64 100755 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -288,7 +288,7 @@ void ObjectMgr::LoadCreatureLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu creature locale strings", (unsigned long)mCreatureLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " creature locale strings", mCreatureLocaleMap.size()); } void ObjectMgr::LoadGossipMenuItemsLocales() @@ -379,7 +379,7 @@ void ObjectMgr::LoadGossipMenuItemsLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu gossip_menu_option locale strings", (unsigned long)mGossipMenuItemsLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " gossip_menu_option locale strings", mGossipMenuItemsLocaleMap.size()); } void ObjectMgr::LoadPointOfInterestLocales() @@ -1347,7 +1347,7 @@ void ObjectMgr::LoadCreatures() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu creatures", (unsigned long)mCreatureDataMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " creatures", mCreatureDataMap.size()); } void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) @@ -1544,7 +1544,7 @@ void ObjectMgr::LoadGameObjects() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu gameobjects", (unsigned long)mGameObjectDataMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " gameobjects", mGameObjectDataMap.size()); } void ObjectMgr::LoadGameObjectAddon() @@ -1771,7 +1771,7 @@ void ObjectMgr::LoadItemLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu Item locale strings", (unsigned long)mItemLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " Item locale strings", mItemLocaleMap.size()); } struct SQLItemLoader : public SQLStorageLoaderBase @@ -4399,7 +4399,7 @@ void ObjectMgr::LoadQuests() } sLog.outString(); - sLog.outString(">> Loaded %lu quests definitions", (unsigned long)mQuestTemplates.size()); + sLog.outString(">> Loaded " SIZEFMTD " quests definitions", mQuestTemplates.size()); } void ObjectMgr::LoadQuestLocales() @@ -4554,7 +4554,7 @@ void ObjectMgr::LoadQuestLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu Quest locale strings", (unsigned long)mQuestLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " Quest locale strings", mQuestLocaleMap.size()); } void ObjectMgr::LoadPageTexts() @@ -4657,7 +4657,7 @@ void ObjectMgr::LoadPageTextLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu PageText locale strings", (unsigned long)mPageTextLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " PageText locale strings", mPageTextLocaleMap.size()); } void ObjectMgr::LoadInstanceEncounters() @@ -4731,7 +4731,7 @@ void ObjectMgr::LoadInstanceEncounters() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu Instance Encounters", (unsigned long)m_DungeonEncounters.size()); + sLog.outString(">> Loaded " SIZEFMTD " Instance Encounters", m_DungeonEncounters.size()); } struct SQLInstanceLoader : public SQLStorageLoaderBase @@ -5004,7 +5004,7 @@ void ObjectMgr::LoadGossipTextLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu NpcText locale strings", (unsigned long)mNpcTextLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " NpcText locale strings", mNpcTextLocaleMap.size()); } // not very fast function but it is called only once a day, or on starting-up @@ -5975,7 +5975,7 @@ void ObjectMgr::LoadGameObjectLocales() delete result; sLog.outString(); - sLog.outString(">> Loaded %lu gameobject locale strings", (unsigned long)mGameObjectLocaleMap.size()); + sLog.outString(">> Loaded " SIZEFMTD " gameobject locale strings", mGameObjectLocaleMap.size()); } struct SQLGameObjectLoader : public SQLStorageLoaderBase diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 7c3533ce9..52ba7b0e4 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4989,7 +4989,7 @@ void Spell::HandleThreatSpells() } } - DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u added an additional %f threat for %s %u target(s)", m_spellInfo->Id, threat, positive ? "assisting" : "harming", uint32(m_UniqueTargetInfo.size())); + DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u added an additional %f threat for %s " SIZEFMTD " target(s)", m_spellInfo->Id, threat, positive ? "assisting" : "harming", m_UniqueTargetInfo.size()); } void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOTarget, SpellEffectIndex i, float DamageMultiplier) diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 95adf95da..244c9966b 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -73,7 +73,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) return; } - DETAIL_LOG("WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, cast_count: %u, spellid: %u, Item: %u, glyphIndex: %u, unk_flags: %u, data length = %i", bagIndex, slot, cast_count, spellid, pItem->GetEntry(), glyphIndex, cast_flags, (uint32)recvPacket.size()); + DETAIL_LOG("WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, cast_count: %u, spellid: %u, Item: %u, glyphIndex: %u, unk_flags: %u, data length = " SIZEFMTD, bagIndex, slot, cast_count, spellid, pItem->GetEntry(), glyphIndex, cast_flags, recvPacket.size()); ItemPrototype const* proto = pItem->GetProto(); if (!proto) @@ -195,7 +195,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) { - DETAIL_LOG("WORLD: CMSG_OPEN_ITEM packet, data length = %i", (uint32)recvPacket.size()); + DETAIL_LOG("WORLD: CMSG_OPEN_ITEM packet, data length = " SIZEFMTD, recvPacket.size()); uint8 bagIndex, slot; @@ -352,8 +352,8 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) return; } - DEBUG_LOG("WORLD: got cast spell packet, spellId - %u, cast_count: %u, cast_flags %u, data length = %i", - spellId, cast_count, cast_flags, (uint32)recvPacket.size()); + DEBUG_LOG("WORLD: got cast spell packet, spellId - %u, cast_count: %u, cast_flags %u, data length = " SIZEFMTD, + spellId, cast_count, unk_flags, recvPacket.size()); SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ef537aa87..db57c53a7 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12131" + #define REVISION_NR "12132" #endif // __REVISION_NR_H__