diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 89dcfa9fa..2063b68e7 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -2111,7 +2111,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S std::vector suitableUnits; suitableUnits.reserve(threatlist.size() - position); advance(itr, position); - for (itr; itr != threatlist.end(); ++itr) + for (; itr != threatlist.end(); ++itr) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) suitableUnits.push_back(pTarget); @@ -2124,7 +2124,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S case ATTACKING_TARGET_TOPAGGRO: { advance(itr, position); - for (itr; itr != threatlist.end(); ++itr) + for (; itr != threatlist.end(); ++itr) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) return pTarget; @@ -2134,7 +2134,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S case ATTACKING_TARGET_BOTTOMAGGRO: { advance(ritr, position); - for (ritr; ritr != threatlist.rend(); ++ritr) + for (; ritr != threatlist.rend(); ++ritr) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) return pTarget; diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index db91bea5c..7744a8d39 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -5415,7 +5415,7 @@ bool ChatHandler::HandleMmapPathCommand(char* args) PointsArray pointPath = path.getPath(); PSendSysMessage("%s's path to %s:", target->GetName(), player->GetName()); PSendSysMessage("Building %s", useStraightPath ? "StraightPath" : "SmoothPath"); - PSendSysMessage("length %i type %u", pointPath.size(), path.getPathType()); + PSendSysMessage("length " SIZEFMTD " type %u", pointPath.size(), path.getPathType()); Vector3 start = path.getStartPosition(); Vector3 end = path.getEndPosition(); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 21dc05a94..afa11572e 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -7169,7 +7169,7 @@ bool ChatHandler::HandleMmapTestArea(char* args) if (!creatureList.empty()) { - PSendSysMessage("Found %i Creatures.", creatureList.size()); + PSendSysMessage("Found " SIZEFMTD " Creatures.", creatureList.size()); uint32 paths = 0; uint32 uStartTime = WorldTimer::getMSTime(); diff --git a/src/mangosd/RASocket.cpp b/src/mangosd/RASocket.cpp index 5ebc6c1e5..316d32586 100644 --- a/src/mangosd/RASocket.cpp +++ b/src/mangosd/RASocket.cpp @@ -157,7 +157,7 @@ int RASocket::handle_input(ACE_HANDLE) if (readBytes <= 0) { - DEBUG_LOG("read %u bytes in RASocket::handle_input", readBytes); + DEBUG_LOG("read " SIZEFMTD " bytes in RASocket::handle_input", readBytes); return -1; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index aac7285ec..1b0b0a87a 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 "12129" + #define REVISION_NR "12130" #endif // __REVISION_NR_H__