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

[9626] Fix one wrong cast case and simplify similar debug output.

Browse source
This commit is contained in:
VladimirMangos 2010-03-27 04:02:29 +03:00
parent 534a54aea7
commit 9311a36d2a
2 changed files with 31 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/game/MotionMaster.cpp
View file

@ -214,11 +214,11 @@ void MotionMaster::MoveRandom()
{ {
if (i_owner->GetTypeId() == TYPEID_PLAYER) if (i_owner->GetTypeId() == TYPEID_PLAYER)
{ {
sLog.outError("Player (GUID: %u) attempt to move random.", i_owner->GetGUIDLow()); sLog.outError("%s attempt to move random.", i_owner->GetObjectGuid().GetString().c_str());
} }
else else
{ {
DEBUG_LOG("Creature (Entry: %u GUID: %u) move random.", i_owner->GetEntry(), i_owner->GetGUIDLow()); DEBUG_LOG("%s move random.", i_owner->GetObjectGuid().GetString().c_str());
Mutate(new RandomMovementGenerator<Creature>(*i_owner)); Mutate(new RandomMovementGenerator<Creature>(*i_owner));
} }
} }
@ -233,42 +233,34 @@ MotionMaster::MoveTargetedHome()
if(i_owner->GetTypeId()==TYPEID_UNIT && !((Creature*)i_owner)->GetCharmerOrOwnerGUID()) if(i_owner->GetTypeId()==TYPEID_UNIT && !((Creature*)i_owner)->GetCharmerOrOwnerGUID())
{ {
DEBUG_LOG("Creature (Entry: %u GUID: %u) targeted home", i_owner->GetEntry(), i_owner->GetGUIDLow()); DEBUG_LOG("%s targeted home", i_owner->GetObjectGuid().GetString().c_str());
Mutate(new HomeMovementGenerator<Creature>()); Mutate(new HomeMovementGenerator<Creature>());
} }
else if(i_owner->GetTypeId()==TYPEID_UNIT && ((Creature*)i_owner)->GetCharmerOrOwnerGUID()) else if(i_owner->GetTypeId()==TYPEID_UNIT && ((Creature*)i_owner)->GetCharmerOrOwnerGUID())
{ {
DEBUG_LOG("Pet or controlled creature (Entry: %u GUID: %u) targeting home", if (Unit *target = ((Creature*)i_owner)->GetCharmerOrOwner())
i_owner->GetEntry(), i_owner->GetGUIDLow() );
Unit *target = ((Creature*)i_owner)->GetCharmerOrOwner();
if(target)
{ {
DEBUG_LOG("Following %s (GUID: %u)", DEBUG_LOG("%s follow to %s", i_owner->GetObjectGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str());
target->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
target->GetTypeId()==TYPEID_PLAYER ? target->GetGUIDLow() : ((Creature*)target)->GetDBTableGUIDLow() );
Mutate(new FollowMovementGenerator<Creature>(*target,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE)); Mutate(new FollowMovementGenerator<Creature>(*target,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE));
} }
else
{
DEBUG_LOG("%s attempt but fail to follow owner", i_owner->GetObjectGuid().GetString().c_str());
}
} }
else else
{ sLog.outError("%s attempt targeted home", i_owner->GetObjectGuid().GetString().c_str());
sLog.outError("Player (GUID: %u) attempt targeted home", i_owner->GetGUIDLow() );
}
} }
void void
MotionMaster::MoveConfused() MotionMaster::MoveConfused()
{ {
DEBUG_LOG("%s move confused", i_owner->GetObjectGuid().GetString().c_str());
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{
DEBUG_LOG("Player (GUID: %u) move confused", i_owner->GetGUIDLow() );
Mutate(new ConfusedMovementGenerator<Player>()); Mutate(new ConfusedMovementGenerator<Player>());
}
else else
{
DEBUG_LOG("Creature (Entry: %u GUID: %u) move confused",
i_owner->GetEntry(), i_owner->GetGUIDLow() );
Mutate(new ConfusedMovementGenerator<Creature>()); Mutate(new ConfusedMovementGenerator<Creature>());
}
} }
void void
@ -278,22 +270,12 @@ MotionMaster::MoveChase(Unit* target, float dist, float angle)
if(!target) if(!target)
return; return;
DEBUG_LOG("%s chase to %s", i_owner->GetObjectGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str());
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{
DEBUG_LOG("Player (GUID: %u) chase to %s (GUID: %u)",
i_owner->GetGUIDLow(),
target->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
target->GetTypeId()==TYPEID_PLAYER ? i_owner->GetGUIDLow() : ((Creature*)i_owner)->GetDBTableGUIDLow() );
Mutate(new ChaseMovementGenerator<Player>(*target,dist,angle)); Mutate(new ChaseMovementGenerator<Player>(*target,dist,angle));
}
else else
{
DEBUG_LOG("Creature (Entry: %u GUID: %u) chase to %s (GUID: %u)",
i_owner->GetEntry(), i_owner->GetGUIDLow(),
target->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
target->GetTypeId()==TYPEID_PLAYER ? target->GetGUIDLow() : ((Creature*)target)->GetDBTableGUIDLow() );
Mutate(new ChaseMovementGenerator<Creature>(*target,dist,angle)); Mutate(new ChaseMovementGenerator<Creature>(*target,dist,angle));
}
} }
void void
@ -305,37 +287,23 @@ MotionMaster::MoveFollow(Unit* target, float dist, float angle)
if(!target) if(!target)
return; return;
DEBUG_LOG("%s follow to %s", i_owner->GetObjectGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str());
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{
DEBUG_LOG("Player (GUID: %u) follow to %s (GUID: %u)", i_owner->GetGUIDLow(),
target->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
target->GetTypeId()==TYPEID_PLAYER ? i_owner->GetGUIDLow() : ((Creature*)i_owner)->GetDBTableGUIDLow() );
Mutate(new FollowMovementGenerator<Player>(*target,dist,angle)); Mutate(new FollowMovementGenerator<Player>(*target,dist,angle));
}
else else
{
DEBUG_LOG("Creature (Entry: %u GUID: %u) follow to %s (GUID: %u)",
i_owner->GetEntry(), i_owner->GetGUIDLow(),
target->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
target->GetTypeId()==TYPEID_PLAYER ? target->GetGUIDLow() : ((Creature*)target)->GetDBTableGUIDLow() );
Mutate(new FollowMovementGenerator<Creature>(*target,dist,angle)); Mutate(new FollowMovementGenerator<Creature>(*target,dist,angle));
}
} }
void void
MotionMaster::MovePoint(uint32 id, float x, float y, float z) MotionMaster::MovePoint(uint32 id, float x, float y, float z)
{ {
DEBUG_LOG("%s targeted point (Id: %u X: %f Y: %f Z: %f)", i_owner->GetObjectGuid().GetString().c_str(), id, x, y, z );
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{
DEBUG_LOG("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", i_owner->GetGUIDLow(), id, x, y, z );
Mutate(new PointMovementGenerator<Player>(id,x,y,z)); Mutate(new PointMovementGenerator<Player>(id,x,y,z));
}
else else
{
DEBUG_LOG("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)",
i_owner->GetEntry(), i_owner->GetGUIDLow(), id, x, y, z );
Mutate(new PointMovementGenerator<Creature>(id,x,y,z)); Mutate(new PointMovementGenerator<Creature>(id,x,y,z));
}
} }
void void
@ -343,12 +311,12 @@ MotionMaster::MoveSeekAssistance(float x, float y, float z)
{ {
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{ {
sLog.outError("Player (GUID: %u) attempt to seek assistance",i_owner->GetGUIDLow()); sLog.outError("%s attempt to seek assistance",i_owner->GetObjectGuid().GetString().c_str());
} }
else else
{ {
DEBUG_LOG("Creature (Entry: %u GUID: %u) seek assistance (X: %f Y: %f Z: %f)", DEBUG_LOG("%s seek assistance (X: %f Y: %f Z: %f)",
i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z ); i_owner->GetObjectGuid().GetString().c_str(), x, y, z );
Mutate(new AssistanceMovementGenerator(x,y,z)); Mutate(new AssistanceMovementGenerator(x,y,z));
} }
} }
@ -358,12 +326,12 @@ MotionMaster::MoveSeekAssistanceDistract(uint32 time)
{ {
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{ {
sLog.outError("Player (GUID: %u) attempt to call distract after assistance",i_owner->GetGUIDLow()); sLog.outError("%s attempt to call distract after assistance",i_owner->GetObjectGuid().GetString().c_str());
} }
else else
{ {
DEBUG_LOG("Creature (Entry: %u GUID: %u) is distracted after assistance call (Time: %u)", DEBUG_LOG("%s is distracted after assistance call (Time: %u)",
i_owner->GetEntry(), i_owner->GetGUIDLow(), time ); i_owner->GetObjectGuid().GetString().c_str(), time );
Mutate(new AssistanceDistractMovementGenerator(time)); Mutate(new AssistanceDistractMovementGenerator(time));
} }
} }
@ -374,20 +342,12 @@ MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
if(!enemy) if(!enemy)
return; return;
DEBUG_LOG("%s flee from %s", i_owner->GetObjectGuid().GetString().c_str(), enemy->GetObjectGuid().GetString().c_str());
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{
DEBUG_LOG("Player (GUID: %u) flee from %s (GUID: %u)", i_owner->GetGUIDLow(),
enemy->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
enemy->GetTypeId()==TYPEID_PLAYER ? enemy->GetGUIDLow() : ((Creature*)enemy)->GetDBTableGUIDLow() );
Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID())); Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID()));
}
else else
{ {
DEBUG_LOG("Creature (Entry: %u GUID: %u) flee from %s (GUID: %u)%s",
i_owner->GetEntry(), i_owner->GetGUIDLow(),
enemy->GetTypeId()==TYPEID_PLAYER ? "player" : "creature",
enemy->GetTypeId()==TYPEID_PLAYER ? enemy->GetGUIDLow() : ((Creature*)enemy)->GetDBTableGUIDLow(),
time ? " for a limited time" : "");
if (time) if (time)
Mutate(new TimedFleeingMovementGenerator(enemy->GetGUID(), time)); Mutate(new TimedFleeingMovementGenerator(enemy->GetGUID(), time));
else else
@ -400,30 +360,21 @@ MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
{ {
if(i_owner->GetTypeId()==TYPEID_PLAYER) if(i_owner->GetTypeId()==TYPEID_PLAYER)
{ {
DEBUG_LOG("Player (GUID: %u) taxi to (Path %u node %u)", i_owner->GetGUIDLow(), path, pathnode); DEBUG_LOG("%s taxi to (Path %u node %u)", i_owner->GetObjectGuid().GetString().c_str(), path, pathnode);
FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(path,pathnode); FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(path,pathnode);
Mutate(mgen); Mutate(mgen);
} }
else else
{ {
sLog.outError("Creature (Entry: %u GUID: %u) attempt taxi to (Path %u node %u)", sLog.outError("%s attempt taxi to (Path %u node %u)",
i_owner->GetEntry(), i_owner->GetGUIDLow(), path, pathnode ); i_owner->GetObjectGuid().GetString().c_str(), path, pathnode );
} }
} }
void void
MotionMaster::MoveDistract(uint32 timer) MotionMaster::MoveDistract(uint32 timer)
{ {
if(i_owner->GetTypeId()==TYPEID_PLAYER) DEBUG_LOG("%s distracted (timer: %u)", i_owner->GetObjectGuid().GetString().c_str(), timer);
{
DEBUG_LOG("Player (GUID: %u) distracted (timer: %u)", i_owner->GetGUIDLow(), timer);
}
else
{
DEBUG_LOG("Creature (Entry: %u GUID: %u) (timer: %u)",
i_owner->GetEntry(), i_owner->GetGUIDLow(), timer);
}
DistractMovementGenerator* mgen = new DistractMovementGenerator(timer); DistractMovementGenerator* mgen = new DistractMovementGenerator(timer);
Mutate(mgen); Mutate(mgen);
} }

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 "9625" #define REVISION_NR "9626"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__