mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12130] Fix more warnings. close #5

Browse source 
* Remove warning: format '<format>' expects type '<type1>', but argument has type 'size_t'
* Remove warning: statement has no effect

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Shyax 2012-08-28 13:01:38 +02:00 • committed by Antz
parent 23c0c6ab3a
commit 5d2dda2e2c
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Creature.cpp
View file

@ -2111,7 +2111,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
std::vector<Unit*> suitableUnits; std::vector<Unit*> suitableUnits;
suitableUnits.reserve(threatlist.size() - position); suitableUnits.reserve(threatlist.size() - position);
advance(itr, position); advance(itr, position);
for (itr; itr != threatlist.end(); ++itr) for (; itr != threatlist.end(); ++itr)
if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
suitableUnits.push_back(pTarget); suitableUnits.push_back(pTarget);
@ -2124,7 +2124,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
case ATTACKING_TARGET_TOPAGGRO: case ATTACKING_TARGET_TOPAGGRO:
{ {
advance(itr, position); advance(itr, position);
for (itr; itr != threatlist.end(); ++itr) for (; itr != threatlist.end(); ++itr)
if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
return pTarget; return pTarget;
@ -2134,7 +2134,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
case ATTACKING_TARGET_BOTTOMAGGRO: case ATTACKING_TARGET_BOTTOMAGGRO:
{ {
advance(ritr, position); advance(ritr, position);
for (ritr; ritr != threatlist.rend(); ++ritr) for (; ritr != threatlist.rend(); ++ritr)
if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid())) if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags)) if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
return pTarget; return pTarget;

2
src/game/Level2.cpp
View file

@ -5415,7 +5415,7 @@ bool ChatHandler::HandleMmapPathCommand(char* args)
PointsArray pointPath = path.getPath(); PointsArray pointPath = path.getPath();
PSendSysMessage("%s's path to %s:", target->GetName(), player->GetName()); PSendSysMessage("%s's path to %s:", target->GetName(), player->GetName());
PSendSysMessage("Building %s", useStraightPath ? "StraightPath" : "SmoothPath"); 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 start = path.getStartPosition();
Vector3 end = path.getEndPosition(); Vector3 end = path.getEndPosition();

2
src/game/Level3.cpp
View file

@ -7169,7 +7169,7 @@ bool ChatHandler::HandleMmapTestArea(char* args)
if (!creatureList.empty()) if (!creatureList.empty())
{ {
PSendSysMessage("Found %i Creatures.", creatureList.size()); PSendSysMessage("Found " SIZEFMTD " Creatures.", creatureList.size());
uint32 paths = 0; uint32 paths = 0;
uint32 uStartTime = WorldTimer::getMSTime(); uint32 uStartTime = WorldTimer::getMSTime();

2
src/mangosd/RASocket.cpp
View file

@ -157,7 +157,7 @@ int RASocket::handle_input(ACE_HANDLE)
if (readBytes <= 0) 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; return -1;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12129" #define REVISION_NR "12130"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__