diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-01 00:39:56 +0100 |
| commit | db8fdd94ed54f46e3482ea33e8e13bf1b3940350 (patch) | |
| tree | d21c9c4008d4558d78dea98f43d5d36a02191266 /src/server/game/Movement/MotionMaster.h | |
| parent | 79dd72ae704bce27f59f33dc99f93e2c36755b0e (diff) | |
Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)
Conflicts:
src/server/bnetserver/Main.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Chat/Channels/Channel.h
src/server/game/Entities/Player/Player.h
src/server/game/Quests/QuestDef.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
src/server/shared/Cryptography/SHA256.h
Diffstat (limited to 'src/server/game/Movement/MotionMaster.h')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 0b547d96e7f..c8da50364ba 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -182,7 +182,7 @@ class MotionMaster //: private std::stack<MovementGenerator *> void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ); void MoveJumpTo(float angle, float speedXY, float speedZ); void MoveJump(Position const& pos, float speedXY, float speedZ, uint32 id = EVENT_JUMP) - { MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); }; + { MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); } void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = EVENT_JUMP); void MoveCirclePath(float x, float y, float z, float radius, bool clockwise, uint8 stepCount); void MoveFall(uint32 id = 0); |