From c7e1eae2ce5dfe99f76087b5607cc50cb84787ee Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 7 Sep 2014 04:06:50 +0200 Subject: Core: Remove again whitespace (meh :/) --- src/server/scripts/World/boss_emerald_dragons.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 23e373312cb..a00c9465a05 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -587,7 +587,7 @@ class boss_taerar : public CreatureScript void Reset() override { me->RemoveAurasDueToSpell(SPELL_SHADE); - + Initialize(); emerald_dragonAI::Reset(); -- cgit v1.2.3 From 9e816c870177c46339a57b61366379a502c88090 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 7 Sep 2014 03:45:50 +0100 Subject: Remove CPP script for Ethereal Teleport Pad Remove CPP script which was not using proper mechanism for activating (ie gossip) --- src/server/scripts/World/go_scripts.cpp | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 3c3f0c2c26b..7ba043f2a2e 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -36,7 +36,6 @@ go_jotunheim_cage go_table_theka go_soulwell go_bashir_crystalforge -go_ethereal_teleport_pad go_soulwell go_dragonflayer_cage go_tadpole_cage @@ -840,32 +839,6 @@ public: } }; -/*###### -## go_ethereal_teleport_pad -######*/ - -enum EtherealTeleportPad -{ - NPC_IMAGE_WIND_TRADER = 20518, - ITEM_TELEPORTER_POWER_PACK = 28969, -}; - -class go_ethereal_teleport_pad : public GameObjectScript -{ -public: - go_ethereal_teleport_pad() : GameObjectScript("go_ethereal_teleport_pad") { } - - bool OnGossipHello(Player* player, GameObject* go) override - { - if (!player->HasItemCount(ITEM_TELEPORTER_POWER_PACK)) - return false; - - go->SummonCreature(NPC_IMAGE_WIND_TRADER, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), go->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); - - return true; - } -}; - /*###### ## go_soulwell ######*/ @@ -1334,7 +1307,6 @@ void AddSC_go_scripts() new go_jotunheim_cage(); new go_table_theka(); new go_inconspicuous_landmark(); - new go_ethereal_teleport_pad(); new go_soulwell(); new go_tadpole_cage(); new go_dragonflayer_cage(); -- cgit v1.2.3