diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
| commit | 547115476f363096483197863e8bbc24064a99ef (patch) | |
| tree | 847450158d5fd445326d41115f551d7bb15e356d /src/server/scripts/World | |
| parent | 4a29c73403c4dc713a8a31cb96289adff2b910c1 (diff) | |
| parent | 2a36d2bf5b7f14284a499a14f476c4633b1fc0eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_warrior.cpp
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index e39cf9096f4..ba17dba602a 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2231,7 +2231,7 @@ public: if (GameObject* launcher = FindNearestLauncher()) { launcher->SendCustomAnim(ANIM_GO_LAUNCH_FIREWORK); - me->SetOrientation(launcher->GetOrientation() + M_PI/2); + me->SetOrientation(launcher->GetOrientation() + float(M_PI) / 2); } else return; |