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

[11947] Improve SCRIPT_COMMAND_MOVE_TO

Browse source 
This changes the handling of SCRIPT_COMMAND_MOVE_TO, to not expect some travel-time, but directly provide the speed for the movement (*100).

Attention to DB-Devs, please check your MOVE_TO scripts.

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Xfurry 2012-04-10 23:36:57 +02:00 • committed by Schmoozerd
parent 78b0ffe4eb
commit ea08f7c5d7
7 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/game/ScriptMgr.cpp
View file

@ -1036,13 +1036,21 @@ void ScriptAction::HandleScriptStep()
break;
}
if (m_script->moveTo.travelTime != 0)
// For command additional teleport the unit
if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
{
float speed = ((Unit*)pSource)->GetDistance(m_script->x, m_script->y, m_script->z) / ((float)m_script->moveTo.travelTime * 0.001f);
((Unit*)pSource)->MonsterMoveWithSpeed(m_script->x, m_script->y, m_script->z, speed);
}
else
((Unit*)pSource)->NearTeleportTo(m_script->x, m_script->y, m_script->z, m_script->o != 0.0f ? m_script->o : ((Unit*)pSource)->GetOrientation());
break;
}
// Normal Movement
if (m_script->moveTo.travelSpeed)
((Unit*)pSource)->MonsterMoveWithSpeed(m_script->x, m_script->y, m_script->z, m_script->moveTo.travelSpeed * 0.01f);
else
{
((Unit*)pSource)->GetMotionMaster()->Clear();
((Unit*)pSource)->GetMotionMaster()->MovePoint(0, m_script->x, m_script->y, m_script->z);
}
break;
}
case SCRIPT_COMMAND_FLAG_SET:
@ -1175,8 +1183,7 @@ void ScriptAction::HandleScriptStep()
pGo->SetLootState(GO_READY);
pGo->SetRespawnTime(time_to_despawn); //despawn object in ? seconds
pGo->GetMap()->Add(pGo);
pGo->Refresh();
break;
}
case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE: