Core/Scripts: Move Ruby Sanctum and Obsidian Sanctum into a combined Chamber of Aspects folder.

Also fixed compile from last commit.
2011-05-30 14:43:40 +02:00
parent c143319b05
commit ee794c5b1c
9 changed files with 10 additions and 10 deletions
@@ -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")
@@ -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;
                    }