summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2017-09-21 11:53:02 +0200
committerYehonal <yehonal.azeroth@gmail.com>2017-09-21 11:53:02 +0200
commit973259925b1725622b2e4dd52648dcd56cf64bca (patch)
tree5fde7b6ebd58671fd8a9c6a445a18ceba5a3edd4
parent343c88f0a449e73972df80f6d3ab24d856b53536 (diff)
Fixed PCH compilation and gcc warnings fixed
+ removed some useless warning suppressions
-rw-r--r--modules/worldengine/nucleus/src/Define.h1
-rw-r--r--modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake4
-rw-r--r--src/game/DataStores/DBCStores.cpp1
-rw-r--r--src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp1
-rw-r--r--src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp1
-rw-r--r--src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp2
-rw-r--r--src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp1
-rw-r--r--src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp2
-rw-r--r--src/scripts/Outland/BlackTemple/boss_illidan.cpp4
-rw-r--r--src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp2
10 files changed, 13 insertions, 6 deletions
diff --git a/modules/worldengine/nucleus/src/Define.h b/modules/worldengine/nucleus/src/Define.h
index a5e99460a3..08bd88c272 100644
--- a/modules/worldengine/nucleus/src/Define.h
+++ b/modules/worldengine/nucleus/src/Define.h
@@ -10,6 +10,7 @@
#include <cstdint>
#include <cstddef>
#include <sys/types.h>
+#include <ace/Basic_Types.h>
#include <ace/ACE_export.h>
#include <ace/Default_Constants.h>
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
index 2b8e6cbdd2..055860c999 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
+++ b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
@@ -15,6 +15,6 @@ if(WITH_COREDEBUG)
endif()
# -Wno-narrowing needed to suppress a warning in g3d
-# -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses -Wreorder -Wlogical-op-parentheses")
+# -Wno-deprecated-register is needed to suppress gsoap warnings on Unix systems.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")
diff --git a/src/game/DataStores/DBCStores.cpp b/src/game/DataStores/DBCStores.cpp
index ea99e4df4f..f9c2648116 100644
--- a/src/game/DataStores/DBCStores.cpp
+++ b/src/game/DataStores/DBCStores.cpp
@@ -12,6 +12,7 @@
#include "TransportMgr.h"
#include "DBCfmt.h"
#include "BattlegroundMgr.h"
+#include "World.h"
#include <map>
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index 5b69fa46e2..690e514eb3 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -5,6 +5,7 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellInfo.h"
+#include "SpellScript.h"
#include "karazhan.h"
enum eSay
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
index c9e56804a0..c294d00893 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -5,6 +5,7 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "karazhan.h"
+#include "SpellScript.h"
enum Yells
{
diff --git a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index 19b6e2c66f..f6a76e367a 100644
--- a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -2,6 +2,8 @@
#include "ScriptMgr.h"
#include "InstanceScript.h"
#include "karazhan.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
const Position OptionalSpawn[] =
{
diff --git a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 5253da6a2b..c23ae52662 100644
--- a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -7,6 +7,7 @@ REWRITTEN BY XINEF
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SmartAI.h"
+#include "ScriptedGossip.h"
enum AshbringerEventMisc
{
diff --git a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index f2104c2452..6771f6c42c 100644
--- a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -327,7 +327,7 @@ class spell_scholomance_shadow_portal : public SpellScriptLoader
}
else
{
- room = (++room)%ROOM_MAX;
+ room = (room+1)%ROOM_MAX;
++attempts;
}
}
diff --git a/src/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/scripts/Outland/BlackTemple/boss_illidan.cpp
index fe7936321e..3e4c0d7b2a 100644
--- a/src/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -459,7 +459,7 @@ class boss_illidan_stormrage : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
- switch (uint32 eventId = events.ExecuteEvent())
+ switch (events.ExecuteEvent())
{
case EVENT_SUMMON_MINIONS:
if (me->HealthBelowPct(90))
@@ -579,7 +579,7 @@ class boss_illidan_stormrage : public CreatureScript
me->CastSpell(me, SPELL_THROW_GLAIVE2, false);
break;
case EVENT_PHASE_2_CHANGE_POS:
- beamPosId = (++beamPosId)%MAX_EYE_BEAM_POS;
+ beamPosId = (beamPosId+1)%MAX_EYE_BEAM_POS;
events.ScheduleEvent(EVENT_SPELL_FIREBALL, 8000, GROUP_PHASE_2_ABILITY);
events.ScheduleEvent(EVENT_SPELL_DARK_BARRAGE, 18000, GROUP_PHASE_2_ABILITY);
events.ScheduleEvent(EVENT_PHASE_2_EYE_BEAM, urand(25000, 50000), GROUP_PHASE_2_ABILITY);
diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 8c4b10ab38..4ef3f64cb4 100644
--- a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -221,7 +221,7 @@ class boss_alar : public CreatureScript
me->SummonCreature(NPC_EMBER_OF_ALAR, *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000);
}
me->GetMotionMaster()->MovePoint(POINT_PLATFORM, alarPoints[platform], false, true);
- platform = (++platform)%4;
+ platform = (platform+1)%4;
events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 30000);
}
me->setAttackTimer(BASE_ATTACK, 20000);