diff options
| author | Spp <spp@jorge.gr> | 2013-01-30 11:57:02 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-30 11:57:02 +0100 |
| commit | 709129f222768b607b13c0f785aa0313f0a934ce (patch) | |
| tree | 7ce9264823841eccf54cc508d6568ce99ec1d7f1 /src/server/scripts/EasternKingdoms | |
| parent | b427068c39188474879c848ba44070ef8a1e246b (diff) | |
| parent | 8cd408ae6cb2a7f9eb84c9e2a57fc65a15ce6faf (diff) | |
Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
Conflicts:
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/Formulas.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Waypoints/WaypointManager.cpp
src/server/game/Skills/SkillDiscovery.cpp
src/server/game/Skills/SkillExtraItems.cpp
src/server/game/Warden/WardenCheckMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp | 7 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index d7441d6311b..fe7f3f47161 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -16,6 +16,11 @@ */ #include "baradin_hold.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" +#include "Player.h" +#include "ObjectAccessor.h" +#include "ScriptedCreature.h" enum Texts { @@ -137,7 +142,7 @@ class boss_alizabal : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 /*type*/, uint32 pointId) { switch (pointId) { diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp index 9bbfebecf2c..0e2b7107548 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp @@ -15,7 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include"baradin_hold.h" +#include "baradin_hold.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" DoorData const doorData[] = { @@ -94,7 +96,8 @@ public: default: break; } - return NULL; + + return 0; } void OnGameObjectRemove(GameObject* go) |