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

[10431] Correcting issues with flying creatures falling to ground at death.

Browse source 
Simplified the way FallGround works and death states are set in a more logical way when a mob is in fact DEAD_FALLING.
Visual will in some cases not be correct. Notes in code for details.

Thanks to Lynx fixing Map::GetHeight
It now return mapHeight as last resort, making FallGround work as expected.
This fix reveal one (known) bug, and therefore a temp hack is added in TargetedMovegen, to be sure Z is not the ground Z for a creature that are able to fly.
Other creatures will follow by the ground level Z (in other words, they will no longer follow in the air).
This commit is contained in:
NoFantasy 2010-09-01 00:30:45 +02:00
parent 7df3f06d87
commit 32e3e252fb
6 changed files with 57 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/game/Creature.cpp
View file

@ -561,15 +561,13 @@ void Creature::Update(uint32 diff)
}
case DEAD_FALLING:
{
if (!FallGround())
setDeathState(JUST_DIED);
setDeathState(CORPSE);
}
default:
break;
}
}
void Creature::StartGroupLoot( Group* group, uint32 timer )
{
m_groupLootId = group->GetId();
@ -1379,13 +1377,8 @@ void Creature::setDeathState(DeathState s)
// always save boss respawn time at death to prevent crash cheating
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY) || isWorldBoss())
SaveRespawnTime();
if (canFly() && FallGround())
return;
if (!IsStopped())
StopMoving();
}
Unit::setDeathState(s);
if (s == JUST_DIED)
@ -1393,17 +1386,19 @@ void Creature::setDeathState(DeathState s)
SetTargetGUID(0); // remove target selection in any cases (can be set at aura remove in Unit::setDeathState)
SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
if (canFly() && FallGround())
return;
if (HasSearchedAssistance())
{
SetNoSearchAssistance(false);
UpdateSpeed(MOVE_RUN, false);
}
// return, since we promote to DEAD_FALLING. DEAD_FALLING is promoted to CORPSE at next update.
if (canFly() && FallGround())
return;
Unit::setDeathState(CORPSE);
}
if (s == JUST_ALIVED)
{
SetHealth(GetMaxHealth());
@ -1423,20 +1418,44 @@ void Creature::setDeathState(DeathState s)
bool Creature::FallGround()
{
// Let's abort after we called this function one time
if (getDeathState() == DEAD_FALLING)
// Only if state is JUST_DIED. DEAD_FALLING is set below and promoted to CORPSE later
if (getDeathState() != JUST_DIED)
return false;
// use larger distance for vmap height search than in most other cases
float tz = GetMap()->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true, MAX_FALL_DISTANCE);
if (tz < INVALID_HEIGHT)
{
DEBUG_LOG("FallGround: creature %u at map %u (x: %f, y: %f, z: %f), not able to retrive a proper GetHeight (z: %f).",
GetEntry(), GetMap()->GetId(), GetPositionX(), GetPositionX(), GetPositionZ(), tz);
}
// Abort too if the ground is very near
if (fabs(GetPositionZ() - tz) < 0.1f)
return false;
Unit::setDeathState(DEAD_FALLING);
GetMotionMaster()->MovePoint(0, GetPositionX(), GetPositionY(), tz);
Relocate(GetPositionX(), GetPositionY(), tz);
float dz = tz - GetPositionZ();
float distance = sqrt(dz*dz);
// flight speed * 2 explicit, not verified though but result looks proper
double speed = GetSpeed(MOVE_FLIGHT) * 2;
speed *= 0.001; // to milliseconds
uint32 travelTime = uint32(distance/speed);
DEBUG_LOG("FallGround: traveltime: %u, distance: %f, speed: %f, from %f to %f", travelTime, distance, speed, GetPositionZ(), tz);
// For creatures that are moving towards target and dies, the visual effect is not nice.
// It is possibly caused by a xyz mismatch in DestinationHolder's GetLocationNow and the location
// of the mob in client. For mob that are already reached target or dies while not moving
// the visual appear to be fairly close to the expected.
GetMap()->CreatureRelocation(this, GetPositionX(), GetPositionY(), tz, GetOrientation());
SendMonsterMove(GetPositionX(), GetPositionY(), tz, SPLINETYPE_NORMAL, SPLINEFLAG_FALLING, travelTime);
return true;
}