diff options
| author | Rushor <Rushor@users.noreply.github.com> | 2017-02-07 00:54:32 +0100 |
|---|---|---|
| committer | Aokromes <Aokromes@users.noreply.github.com> | 2017-02-07 00:54:32 +0100 |
| commit | 85357c75c4a202e2b7b72e14fe0d4083f74c87bb (patch) | |
| tree | 13da3fbef6065b8d9fc83da42a6d9b5e60132c98 | |
| parent | 9e65fead38c486ec8a971a09a95ffae912943a83 (diff) | |
Game/Mapscripts: Implement SCRIPT_COMMAND_MOVEMENT
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 10 | ||||
| -rw-r--r-- | src/server/game/Maps/MapScripts.cpp | 22 |
3 files changed, 32 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 183634bd68e..8ad528ac1b4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -109,6 +109,7 @@ std::string GetScriptCommandName(ScriptCommands command) case SCRIPT_COMMAND_MODEL: res = "SCRIPT_COMMAND_MODEL"; break; case SCRIPT_COMMAND_CLOSE_GOSSIP: res = "SCRIPT_COMMAND_CLOSE_GOSSIP"; break; case SCRIPT_COMMAND_PLAYMOVIE: res = "SCRIPT_COMMAND_PLAYMOVIE"; break; + case SCRIPT_COMMAND_MOVEMENT: res = "SCRIPT_COMMAND_MOVEMENT"; break; default: { char sz[32]; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 73508444786..f029a7395a3 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -114,7 +114,8 @@ enum ScriptCommands SCRIPT_COMMAND_EQUIP = 31, // soucre = Creature, datalong = equipment id SCRIPT_COMMAND_MODEL = 32, // source = Creature, datalong = model id SCRIPT_COMMAND_CLOSE_GOSSIP = 33, // source = Player - SCRIPT_COMMAND_PLAYMOVIE = 34 // source = Player, datalong = movie id + SCRIPT_COMMAND_PLAYMOVIE = 34, // source = Player, datalong = movie id + SCRIPT_COMMAND_MOVEMENT = 35 // soucre = Creature, datalong = MovementType, datalong2 = MovementDistance (spawndist f.ex.), dataint = pathid }; // Benchmarked: Faster than std::unordered_map (insert/find) @@ -363,6 +364,13 @@ struct ScriptInfo { uint32 MovieID; // datalong } PlayMovie; + + struct // SCRIPT_COMMAND_MOVEMENT (35) + { + uint32 MovementType; // datalong + uint32 MovementDistance; // datalong2 + int32 Path; // dataint + } Movement; }; std::string GetDebugInfo() const; diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 300c7fa38e5..a4c51246bbc 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -872,6 +872,28 @@ void Map::ScriptsProcess() player->SendMovieStart(step.script->PlayMovie.MovieID); break; + case SCRIPT_COMMAND_MOVEMENT: + // Source must be Creature. + if (Creature* cSource = _GetScriptCreature(source, true, step.script)) + { + if (!cSource->IsAlive()) + return; + + cSource->GetMotionMaster()->MovementExpired(); + cSource->GetMotionMaster()->MoveIdle(); + + switch (step.script->Movement.MovementType) + { + case RANDOM_MOTION_TYPE: + cSource->GetMotionMaster()->MoveRandom((float)step.script->Movement.MovementDistance); + break; + case WAYPOINT_MOTION_TYPE: + cSource->GetMotionMaster()->MovePath(step.script->Movement.Path, false); + break; + } + } + break; + default: TC_LOG_ERROR("scripts", "Unknown script command %s.", step.script->GetDebugInfo().c_str()); break; |