From ee794c5b1c042182c0647811a60a9cfac3a29662 Mon Sep 17 00:00:00 2001 From: kaelima Date: Mon, 30 May 2011 14:43:40 +0200 Subject: [PATCH] Core/Scripts: Move Ruby Sanctum and Obsidian Sanctum into a combined Chamber of Aspects folder. Also fixed compile from last commit. --- src/server/scripts/Northrend/CMakeLists.txt | 16 ++++++++-------- .../ObsidianSanctum/boss_sartharion.cpp | 0 .../instance_obsidian_sanctum.cpp | 0 .../ObsidianSanctum/obsidian_sanctum.h | 0 .../RubySanctum/boss_baltharus_the_warborn.cpp | 0 .../RubySanctum/boss_saviana_ragefire.cpp | 0 .../RubySanctum/instance_ruby_sanctum.cpp | 4 ++-- .../RubySanctum/ruby_sanctum.cpp | 0 .../RubySanctum/ruby_sanctum.h | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/ObsidianSanctum/boss_sartharion.cpp (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/ObsidianSanctum/instance_obsidian_sanctum.cpp (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/ObsidianSanctum/obsidian_sanctum.h (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/RubySanctum/boss_baltharus_the_warborn.cpp (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/RubySanctum/boss_saviana_ragefire.cpp (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/RubySanctum/instance_ruby_sanctum.cpp (98%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/RubySanctum/ruby_sanctum.cpp (100%) rename src/server/scripts/Northrend/{ => ChamberOfAspects}/RubySanctum/ruby_sanctum.h (100%) diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index cd28cf5a50..04d906519a 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -41,9 +41,14 @@ set(scripts_STAT_SRCS Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp - Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp - Northrend/ObsidianSanctum/obsidian_sanctum.h - Northrend/ObsidianSanctum/boss_sartharion.cpp + Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp + Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h + Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp + Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp + Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h + Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp + Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp + Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -185,11 +190,6 @@ set(scripts_STAT_SRCS Northrend/DraktharonKeep/drak_tharon_keep.h Northrend/DraktharonKeep/boss_tharon_ja.cpp Northrend/DraktharonKeep/boss_dred.cpp - Northrend/RubySanctum/instance_ruby_sanctum.cpp - Northrend/RubySanctum/ruby_sanctum.h - Northrend/RubySanctum/ruby_sanctum.cpp - Northrend/RubySanctum/boss_baltharus_the_warborn.cpp - Northrend/RubySanctum/boss_saviana_ragefire.cpp ) message(" -> Prepared: Northrend") diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp similarity index 100% rename from src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp similarity index 100% rename from src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp diff --git a/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h similarity index 100% rename from src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h diff --git a/src/server/scripts/Northrend/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp similarity index 100% rename from src/server/scripts/Northrend/RubySanctum/boss_baltharus_the_warborn.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp diff --git a/src/server/scripts/Northrend/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp similarity index 100% rename from src/server/scripts/Northrend/RubySanctum/boss_saviana_ragefire.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp diff --git a/src/server/scripts/Northrend/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp similarity index 98% rename from src/server/scripts/Northrend/RubySanctum/instance_ruby_sanctum.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 8d4e1e2ad0..3672152bee 100644 --- a/src/server/scripts/Northrend/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -141,7 +141,7 @@ class instance_ruby_sanctum : public InstanceMapScript flameWalls->SetGoState(GO_STATE_READY); } if (Creature* zarithrian = instance->GetCreature(GeneralZarithrianGUID)) - zarithrian->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE) + zarithrian->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } break; } @@ -155,7 +155,7 @@ class instance_ruby_sanctum : public InstanceMapScript flameWalls->SetGoState(GO_STATE_READY); } if (Creature* zarithrian = instance->GetCreature(GeneralZarithrianGUID)) - zarithrian->RemoveFlag(UNIT_FLAG, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE) + zarithrian->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } break; } diff --git a/src/server/scripts/Northrend/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp similarity index 100% rename from src/server/scripts/Northrend/RubySanctum/ruby_sanctum.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp diff --git a/src/server/scripts/Northrend/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h similarity index 100% rename from src/server/scripts/Northrend/RubySanctum/ruby_sanctum.h rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h