From d230302b16474ff22a35243ffed6236ef4fc7fb9 Mon Sep 17 00:00:00 2001 From: Paradox Date: Mon, 9 Feb 2009 08:16:34 -0500 Subject: Replace tabs with spaces in more files. --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/game/ObjectMgr.cpp') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 08fcc059b8b..a68b8315492 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -5112,9 +5112,9 @@ void ObjectMgr::LoadAreaTriggerTeleports() uint32 count = 0; - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 QueryResult *result = WorldDatabase.Query("SELECT id, required_level, required_item, required_item2, heroic_key, heroic_key2, heroic_required_quest_done, heroic_required_failed_quest_text, required_quest_done, required_failed_text, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); - if( !result ) + if( !result ) { barGoLink bar( 1 ); @@ -5201,14 +5201,14 @@ void ObjectMgr::LoadAreaTriggerTeleports() } } - if(at.heroicQuest) - { - if(!mQuestTemplates[at.heroicQuest]) - { - sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",at.heroicQuest,Trigger_ID); - at.heroicQuest = 0; - } - } + if(at.heroicQuest) + { + if(!mQuestTemplates[at.heroicQuest]) + { + sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",at.heroicQuest,Trigger_ID); + at.heroicQuest = 0; + } + } if(at.requiredQuest) { -- cgit v1.2.3 From f385747164c3fb278c92ef46fbd6c3da6590bbf0 Mon Sep 17 00:00:00 2001 From: KingPin Date: Mon, 9 Feb 2009 14:28:01 -0500 Subject: Add newline at end of file. --HG-- branch : trunk --- contrib/vmap_extractor_v2/vmapextract/wmo.h | 2 +- sql/updates/1018_world.sql | 2 +- sql/updates/1026_world.sql | 2 +- sql/updates/1028_world_scripts.sql | 2 +- sql/updates/973_world_scripts.sql | 2 +- src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp | 2 +- .../scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp | 2 +- .../scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp | 2 +- src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp | 2 +- src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp | 2 +- .../scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h | 2 +- src/game/ObjectMgr.cpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/game/ObjectMgr.cpp') diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.h b/contrib/vmap_extractor_v2/vmapextract/wmo.h index b8f6439e381..c3bb4ce3ae5 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wmo.h +++ b/contrib/vmap_extractor_v2/vmapextract/wmo.h @@ -104,4 +104,4 @@ public: static void reset(); }; -#endif \ No newline at end of file +#endif diff --git a/sql/updates/1018_world.sql b/sql/updates/1018_world.sql index ca298faa8f3..d231eb168b9 100644 --- a/sql/updates/1018_world.sql +++ b/sql/updates/1018_world.sql @@ -3,4 +3,4 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm (31224, -1543, 2, 'Cloak of Shadows - Flare'), (41292, 42017, 2, 'Aura of Suffering'), (44007, -43657, 2, 'Storm Eye Safe Zone Immune'), -(44867, -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm'); \ No newline at end of file +(44867, -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm'); diff --git a/sql/updates/1026_world.sql b/sql/updates/1026_world.sql index 90ff7d23120..ae189469b41 100644 --- a/sql/updates/1026_world.sql +++ b/sql/updates/1026_world.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705'); INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES ('-33711','33686','0','Murmur\'s Shockwave (Normal)'), ('-38794','33686','0','Murmur\'s Shockwave (Heroic)'), -('33686','31705','0','Murmur\'s Shockwave Jump'); \ No newline at end of file +('33686','31705','0','Murmur\'s Shockwave Jump'); diff --git a/sql/updates/1028_world_scripts.sql b/sql/updates/1028_world_scripts.sql index 2023243b456..9c821c7b093 100644 --- a/sql/updates/1028_world_scripts.sql +++ b/sql/updates/1028_world_scripts.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882'; \ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882'; diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/973_world_scripts.sql index 42b970aaed6..b53219c6afe 100644 --- a/sql/updates/973_world_scripts.sql +++ b/sql/updates/973_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059); \ No newline at end of file +update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059); diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index 857b682748d..529f9dbecdc 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -161,4 +161,4 @@ void AddSC_arathi_highlands() newscript->GetAI = &GetAI_npc_professor_phizzlethorpeAI; newscript->pQuestAccept = &QuestAccept_npc_professor_phizzlethorpe; newscript->RegisterSelf(); -} \ No newline at end of file +} diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 58228135a01..2ffc6f33497 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -402,4 +402,4 @@ void AddSC_dark_portal() newscript->pGossipHello = &GossipHello_npc_saat; newscript->pGossipSelect = &GossipSelect_npc_saat; newscript->RegisterSelf(); -} \ No newline at end of file +} diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index 16b889a122b..290c7e86470 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -379,4 +379,4 @@ void AddSC_instance_dark_portal() newscript->Name = "instance_dark_portal"; newscript->GetInstanceData = &GetInstanceData_instance_dark_portal; newscript->RegisterSelf(); -} \ No newline at end of file +} diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index c621ebf566c..9d975a2ff02 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -307,4 +307,4 @@ void AddSC_boss_onyxia() newscript->Name="boss_onyxia"; newscript->GetAI = &GetAI_boss_onyxiaAI; newscript->RegisterSelf(); -} \ No newline at end of file +} diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 5c9274ca5b9..0a230e4e262 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -201,4 +201,4 @@ void AddSC_razorfen_kraul() newscript->GetAI = &GetAI_npc_willix; newscript->pQuestAccept = &QuestAccept_npc_willix; newscript->RegisterSelf(); -} \ No newline at end of file +} diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h index e765eca59d9..3c5532baf21 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h @@ -12,4 +12,4 @@ #define DATA_HORSEMAN_EVENT 5 #define GAMEOBJECT_PUMPKIN_SHRINE 6 -#endif \ No newline at end of file +#endif diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index a68b8315492..8ba8320b432 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -7597,4 +7597,4 @@ void ObjectMgr::LoadTransportEvents() sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() ); delete result; -} \ No newline at end of file +} -- cgit v1.2.3