Fixed PCH compilation and gcc warnings fixed

+ removed some useless warning suppressions
This commit is contained in:
Yehonal
2017-09-21 11:53:02 +02:00
parent 343c88f0a4
commit 973259925b
10 changed files with 13 additions and 6 deletions

View File

@@ -10,6 +10,7 @@
#include <cstdint> #include <cstdint>
#include <cstddef> #include <cstddef>
#include <sys/types.h> #include <sys/types.h>
#include <ace/Basic_Types.h>
#include <ace/ACE_export.h> #include <ace/ACE_export.h>
#include <ace/Default_Constants.h> #include <ace/Default_Constants.h>

View File

@@ -15,6 +15,6 @@ if(WITH_COREDEBUG)
endif() endif()
# -Wno-narrowing needed to suppress a warning in g3d # -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. # -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 -Wstring-plus-int -Wparentheses -Wreorder -Wlogical-op-parentheses") 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") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")

View File

@@ -12,6 +12,7 @@
#include "TransportMgr.h" #include "TransportMgr.h"
#include "DBCfmt.h" #include "DBCfmt.h"
#include "BattlegroundMgr.h" #include "BattlegroundMgr.h"
#include "World.h"
#include <map> #include <map>

View File

@@ -5,6 +5,7 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "SpellInfo.h" #include "SpellInfo.h"
#include "SpellScript.h"
#include "karazhan.h" #include "karazhan.h"
enum eSay enum eSay

View File

@@ -5,6 +5,7 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "karazhan.h" #include "karazhan.h"
#include "SpellScript.h"
enum Yells enum Yells
{ {

View File

@@ -2,6 +2,8 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "InstanceScript.h" #include "InstanceScript.h"
#include "karazhan.h" #include "karazhan.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
const Position OptionalSpawn[] = const Position OptionalSpawn[] =
{ {

View File

@@ -7,6 +7,7 @@ REWRITTEN BY XINEF
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "SmartAI.h" #include "SmartAI.h"
#include "ScriptedGossip.h"
enum AshbringerEventMisc enum AshbringerEventMisc
{ {

View File

@@ -327,7 +327,7 @@ class spell_scholomance_shadow_portal : public SpellScriptLoader
} }
else else
{ {
room = (++room)%ROOM_MAX; room = (room+1)%ROOM_MAX;
++attempts; ++attempts;
} }
} }

View File

@@ -459,7 +459,7 @@ class boss_illidan_stormrage : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch (uint32 eventId = events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_SUMMON_MINIONS: case EVENT_SUMMON_MINIONS:
if (me->HealthBelowPct(90)) if (me->HealthBelowPct(90))
@@ -579,7 +579,7 @@ class boss_illidan_stormrage : public CreatureScript
me->CastSpell(me, SPELL_THROW_GLAIVE2, false); me->CastSpell(me, SPELL_THROW_GLAIVE2, false);
break; break;
case EVENT_PHASE_2_CHANGE_POS: 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_FIREBALL, 8000, GROUP_PHASE_2_ABILITY);
events.ScheduleEvent(EVENT_SPELL_DARK_BARRAGE, 18000, 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); events.ScheduleEvent(EVENT_PHASE_2_EYE_BEAM, urand(25000, 50000), GROUP_PHASE_2_ABILITY);

View File

@@ -221,7 +221,7 @@ class boss_alar : public CreatureScript
me->SummonCreature(NPC_EMBER_OF_ALAR, *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); me->SummonCreature(NPC_EMBER_OF_ALAR, *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000);
} }
me->GetMotionMaster()->MovePoint(POINT_PLATFORM, alarPoints[platform], false, true); me->GetMotionMaster()->MovePoint(POINT_PLATFORM, alarPoints[platform], false, true);
platform = (++platform)%4; platform = (platform+1)%4;
events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 30000); events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 30000);
} }
me->setAttackTimer(BASE_ATTACK, 20000); me->setAttackTimer(BASE_ATTACK, 20000);