Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
This commit is contained in:
1 parent
d42212b595
commit
bf8b642a47
14 files changed
+19
-27
No files matched your search
@@ -238,16 +238,7 @@ class instance_deadmines : public InstanceMapScript
|
||||
|
||||
void DoPlaySound(GameObject* unit, uint32 sound)
|
||||
{
|
||||
WorldPacket data(4);
|
||||
data.SetOpcode(SMSG_PLAY_SOUND);
|
||||
data << uint32(sound);
|
||||
unit->SendMessageToSet(&data, false);
|
||||
}
|
||||
|
||||
void DoPlaySoundCreature(Unit* unit, uint32 sound)
|
||||
{
|
||||
WorldPacket data(4);
|
||||
data.SetOpcode(SMSG_PLAY_SOUND);
|
||||
WorldPacket data(SMSG_PLAY_SOUND, 4);
|
||||
data << uint32(sound);
|
||||
unit->SendMessageToSet(&data, false);
|
||||
}
|
||||
|
||||
@@ -241,8 +241,7 @@ public:
|
||||
// Also needs an exception in spell system.
|
||||
unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID());
|
||||
// Use packet hack
|
||||
WorldPacket data(12);
|
||||
data.SetOpcode(SMSG_MOVE_SET_CAN_FLY);
|
||||
WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 12);
|
||||
data.append(unit->GetPackGUID());
|
||||
data << uint32(0);
|
||||
unit->SendMessageToSet(&data, true);
|
||||
@@ -262,8 +261,7 @@ public:
|
||||
unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
|
||||
unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT);
|
||||
|
||||
WorldPacket data(12);
|
||||
data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY);
|
||||
WorldPacket data(SMSG_MOVE_UNSET_CAN_FLY, 12);
|
||||
data.append(unit->GetPackGUID());
|
||||
data << uint32(0);
|
||||
unit->SendMessageToSet(&data, true);
|
||||
|
||||
@@ -15,8 +15,6 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ScriptPCH.h"
|
||||
|
||||
void AddSC_event_childrens_week();
|
||||
|
||||
void AddSC_event_scripts()
|
||||
|
||||
+1
@@ -24,6 +24,7 @@
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "trial_of_the_crusader.h"
|
||||
#include "SpellScript.h"
|
||||
#include <limits>
|
||||
|
||||
enum Yells
|
||||
|
||||
+1
@@ -22,6 +22,7 @@
|
||||
#include "SpellAuraEffects.h"
|
||||
#include "trial_of_the_crusader.h"
|
||||
#include "Player.h"
|
||||
#include "GridNotifiers.h"
|
||||
|
||||
enum Yells
|
||||
{
|
||||
|
||||
+1
@@ -19,6 +19,7 @@
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "trial_of_the_crusader.h"
|
||||
#include "SpellScript.h"
|
||||
|
||||
enum Yells
|
||||
{
|
||||
|
||||
+2
@@ -23,6 +23,8 @@
|
||||
#include "ScriptedCreature.h"
|
||||
#include "trial_of_the_crusader.h"
|
||||
#include "Vehicle.h"
|
||||
#include "Player.h"
|
||||
#include "SpellScript.h"
|
||||
|
||||
enum Yells
|
||||
{
|
||||
|
||||
@@ -374,7 +374,7 @@ class boss_algalon_the_observer : public CreatureScript
|
||||
case ACTION_INIT_ALGALON:
|
||||
_firstPull = false;
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -489,7 +489,7 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader
|
||||
pos.m_positionX = 1756.25f + irand(-3, 3);
|
||||
pos.m_positionY = -8.3f + irand(-3, 3);
|
||||
pos.m_positionZ = 448.8f;
|
||||
pos.m_orientation = M_PI;
|
||||
pos.SetOrientation(M_PI);
|
||||
GetHitPlayer()->DestroyForNearbyPlayers();
|
||||
GetHitPlayer()->ExitVehicle(&pos);
|
||||
GetHitPlayer()->UpdateObjectVisibility(false);
|
||||
|
||||
@@ -926,8 +926,7 @@ class boss_kaelthas : public CreatureScript
|
||||
unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID());
|
||||
|
||||
//Using packet workaround
|
||||
WorldPacket data(12);
|
||||
data.SetOpcode(SMSG_MOVE_SET_CAN_FLY);
|
||||
WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 12);
|
||||
data.append(unit->GetPackGUID());
|
||||
data << uint32(0);
|
||||
unit->SendMessageToSet(&data, true);
|
||||
@@ -953,8 +952,7 @@ class boss_kaelthas : public CreatureScript
|
||||
if (Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()))
|
||||
{
|
||||
//Using packet workaround
|
||||
WorldPacket data(12);
|
||||
data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY);
|
||||
WorldPacket data(SMSG_MOVE_UNSET_CAN_FLY, 12);
|
||||
data.append(unit->GetPackGUID());
|
||||
data << uint32(0);
|
||||
unit->SendMessageToSet(&data, true);
|
||||
|
||||
@@ -1706,7 +1706,7 @@ public:
|
||||
if (pet->isGuardian())
|
||||
((Guardian*)pet)->SetBonusDamage(owner->GetTotalAttackPowerValue(BASE_ATTACK));
|
||||
|
||||
amount += owner->CalculateDamage(BASE_ATTACK, true, true);;
|
||||
amount += owner->CalculateDamage(BASE_ATTACK, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user